- Wine-Commits - list.winehq.org

Eric Pouech : cmd: Use CRT's popen instead of rewriting it.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: ae9bdbda3be2b4ab5be34463fe1daec6c11cc7e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae9bdbda3be2b4ab5be34463fe1dae… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 18 10:02:23 2024 +0200 cmd: Use CRT's popen instead of rewriting it. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 69 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ca703af52ec..779df2b65b0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2062,47 +2062,38 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { - WCHAR temp_str[MAX_PATH]; - WCHAR temp_file[MAX_PATH]; - WCHAR temp_cmd[MAXSTRING]; - WCHAR *trimmed = NULL; - FILE* ret; - - /* Remove leading and trailing character (but there may be trailing whitespace too) */ - if ((iscmd && (itemstr[0] == '`' && usebackq)) || - (iscmd && (itemstr[0] == '\'' && !usebackq)) || - (!iscmd && (itemstr[0] == '"' && usebackq))) - { - trimmed = WCMD_strtrim(itemstr); - if (trimmed) { - itemstr = trimmed; - } - itemstr[lstrlenW(itemstr)-1] = 0x00; - itemstr++; - } - - if (iscmd) { - /* Get temp filename */ - GetTempPathW(ARRAY_SIZE(temp_str), temp_str); - GetTempFileNameW(temp_str, L"CMD", 0, temp_file); +static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) +{ + WCHAR *trimmed = NULL; + FILE* ret; - /* Redirect output to the temporary file */ - wsprintfW(temp_str, L">%s", temp_file); - wsprintfW(temp_cmd, L"CMD.EXE /C %s", itemstr); - WINE_TRACE("Issuing '%s' with redirs '%s'\n", - wine_dbgstr_w(temp_cmd), wine_dbgstr_w(temp_str)); - WCMD_execute (temp_cmd, temp_str, NULL, FALSE); + /* Remove leading and trailing character (but there may be trailing whitespace too) */ + if ((iscmd && (itemstr[0] == '`' && usebackq)) || + (iscmd && (itemstr[0] == '\'' && !usebackq)) || + (!iscmd && (itemstr[0] == '"' && usebackq))) + { + trimmed = WCMD_strtrim(itemstr); + if (trimmed) + itemstr = trimmed; + itemstr[lstrlenW(itemstr)-1] = 0x00; + itemstr++; + } - /* Open the file, read line by line and process */ - ret = _wfopen(temp_file, L"rt,ccs=unicode"); - } else { - /* Open the file, read line by line and process */ - WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); - ret = _wfopen(itemstr, L"rt,ccs=unicode"); - } - free(trimmed); - return ret; + if (iscmd) + { + WCHAR temp_cmd[MAXSTRING]; + wsprintfW(temp_cmd, L"CMD.EXE /C %s", itemstr); + WINE_TRACE("Reading output of '%s'\n", wine_dbgstr_w(temp_cmd)); + ret = _wpopen(temp_cmd, L"rt,ccs=unicode"); + } + else + { + /* Open the file, read line by line and process */ + WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); + ret = _wfopen(itemstr, L"rt,ccs=unicode"); + } + free(trimmed); + return ret; } /**************************************************************************

1 0

Daniel Lehman : msvcrt/tests: Add result for Turkish_Türkiye.1254.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 218c4ac11564f57a2feb4486e4f661854f18bef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/218c4ac11564f57a2feb4486e4f661… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 1 15:26:56 2024 -0700 msvcrt/tests: Add result for Turkish_Türkiye.1254. --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f77e8f93abb..ede9728517e 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -573,12 +573,14 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "trk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "turkish"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "uk"); ok(ret != NULL, "ret == NULL\n");

1 0

Elizabeth Figura : maintainers: Change the full form of my name.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 06cb24bb65d0b91d4e77d03c17111f04d7d233c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/06cb24bb65d0b91d4e77d03c17111f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 8 00:15:17 2024 -0500 maintainers: Change the full form of my name. And update to a more reliable email address. --- .mailmap | 3 ++- AUTHORS | 2 +- MAINTAINERS | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index 7cf13e67174..2439fd362ad 100644 --- a/.mailmap +++ b/.mailmap @@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi(a)bigfoot.com> Dimitrie O. Paun <dimi(a)lattica.com> EA Durbin <eadurbin(a)freebsd.org> Eduardo García <eduardo.garcia(a)gmx.com> +Elizabeth Figura <z.figura12(a)gmail.com> +Elizabeth Figura <zfigura(a)codeweavers.com> Erich Hoover <erich.e.hoover(a)gmail.com> Erich Hoover <erich.e.hoover(a)wine-staging.com> Erwin Wolff <erwinwolffnl(a)microformatica.com> @@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra(a)yahoo.com> Won Kyu Park <wkpark(a)kldp.org> Yuri Kozlov <yuriy.kozlov(a)gmail.com> Zachary Brown <zac(a)zacbrown.org> -Zebediah Figura <zfigura(a)codeweavers.com> Zoltan Nagy <nagyzoli(a)drotposta.hu> unidentified <9700584(a)cs.stadia.fi> unidentified <develop(a)stueben.com> diff --git a/AUTHORS b/AUTHORS index da301ba9d1a..117940d75ce 100644 --- a/AUTHORS +++ b/AUTHORS @@ -490,6 +490,7 @@ Ekaterine Papava Elias Benali Elias Ross Elie Morisse +Elizabeth Figura Emilio Cobos Álvarez Emmanuel Maillard Enol Puente @@ -1896,7 +1897,6 @@ Zachary Brown Zach Goldberg Zach Gorman Zach Smith -Zebediah Figura Zhangrong Huang Zhang Shuai Zhan Jianyu diff --git a/MAINTAINERS b/MAINTAINERS index 34c2acdd56b..22979d93ea1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -66,7 +66,7 @@ P: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ Direct3D -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> M: Jan Sikorski <jsikorski(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> @@ -106,7 +106,7 @@ F: dlls/dpnet/ F: dlls/dpwsockx/ DirectShow -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ @@ -159,7 +159,7 @@ M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ GStreamer multimedia backend -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/ @@ -173,7 +173,7 @@ F: dlls/mouhid.sys/ F: dlls/winehid.sys/ HTTP server -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/httpapi/ F: dlls/http.sys/ @@ -214,7 +214,7 @@ F: dlls/msacm32/ Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/mf/tests/transform.c F: dlls/winegstreamer/aac_decoder.c F: dlls/winegstreamer/color_convert.c @@ -238,7 +238,7 @@ F: dlls/vcruntime140_1/ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/msi/ Netstat @@ -288,7 +288,7 @@ P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c Plug and Play -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/newdev/ F: dlls/ntoskrnl.exe/pnp.c F: dlls/setupapi/devinst.c @@ -310,7 +310,7 @@ F: dlls/riched20/ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/rpcrt4/ Theming @@ -349,7 +349,7 @@ F: dlls/shdocvw/ WIDL P: Huw Davies <huw(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: tools/widl/ Windows Imaging Component @@ -365,7 +365,7 @@ F: dlls/wbemprox/ F: dlls/wmiutils/ Windows Media Format -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/wmp/ F: dlls/wmvcore/ @@ -431,7 +431,7 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0

Ziqing Hui : winegstreamer/video_decoder: Make output_plane_align specific to h264.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 08478473b720e02a403a15b44462b15ebda0e40b URL: https://gitlab.winehq.org/wine/wine/-/commit/08478473b720e02a403a15b44462b1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 8 11:15:23 2024 +0800 winegstreamer/video_decoder: Make output_plane_align specific to h264. If we set output align to wmv decoder, it will fail at copy_video_buffer(). The output size will larger than the sample we provided due to alignment. --- dlls/winegstreamer/video_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 60eca8ba6bd..6525cbff513 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1500,7 +1500,6 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) goto failed; - decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.input_queue_length = 15; *out = decoder; @@ -1569,6 +1568,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->output_info.cbSize = 1920 * 1088 * 2; + decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.allow_size_change = TRUE; TRACE("Created h264 transform %p.\n", &decoder->IMFTransform_iface);

1 0

Dmitry Timoshkov : user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: fdc2caf6788c071f89d5b5f402d70a661987e47b URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc2caf6788c071f89d5b5f402d70a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 19:58:12 2024 +0300 user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/dce.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 613512d0f5f..18f31e3708c 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -369,6 +369,7 @@ static void test_dc_visrgn(void) /* parent DC */ hdc = GetDC( hwnd_parentdc ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); ReleaseDC( hwnd_parentdc, hdc ); hdc = GetDC( hwnd_parent ); @@ -508,18 +509,19 @@ static void test_begin_paint(void) RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); hdc = BeginPaint( hwnd_parentdc, &ps ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); cr = SetPixel( hdc, 10, 10, RGB(255, 0, 0) ); ok( cr != -1, "error drawing outside of window client area\n" ); EndPaint( hwnd_parentdc, &ps ); GetClientRect( hwnd_parent, &parent_rect ); - ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); - ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); + todo_wine ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); + todo_wine ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); todo_wine ok( rect.right == parent_rect.right, "rect.right = %ld, expected %ld\n", rect.right, parent_rect.right ); todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %ld, expected %ld\n", rect.bottom, parent_rect.bottom ); hdc = GetDC( hwnd_parent ); - todo_wine ok( GetPixel( hdc, 10, 10 ) == cr, "error drawing outside of window client area\n" ); + todo_wine ok( GetPixel( hdc, 60, 60 ) == cr, "error drawing outside of window client area\n" ); ReleaseDC( hwnd_parent, hdc ); } @@ -772,7 +774,7 @@ START_TEST(dce) hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, 400, 0, 100, 100, 0, 0, 0, NULL ); hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, - 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + 50, 50, 1, 1, hwnd_parent, 0, 0, NULL ); test_dc_attributes(); test_parameters();

1 0

Rémi Bernon : winegstreamer: Introduce a new check_video_transform_support helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 067d4f047247b39a5866c1d7b22b5f16b5187d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/067d4f047247b39a5866c1d7b22b5f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 17:51:49 2024 +0200 winegstreamer: Introduce a new check_video_transform_support helper. --- dlls/winegstreamer/color_convert.c | 31 +++++++-------------- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 25 +++++++++++++++++ dlls/winegstreamer/video_decoder.c | 53 +++++++++++++++--------------------- dlls/winegstreamer/video_processor.c | 31 +++++++-------------- 5 files changed, 68 insertions(+), 73 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index b5a1261b669..949b85943d0 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -907,39 +907,28 @@ static const IPropertyStoreVtbl property_store_vtbl = HRESULT color_convert_create(IUnknown *outer, IUnknown **out) { - static const struct wg_format input_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_NV12, }; - struct wg_transform_attrs attrs = {0}; - wg_transform_t transform; struct color_convert *impl; HRESULT hr; TRACE("outer %p, out %p.\n", outer, out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support video conversion, please install appropriate plugins.\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 91020e973ac..78b9c4c3aa0 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,7 @@ void wg_transform_notify_qos(wg_transform_t transform, bool underflow, double proportion, int64_t diff, uint64_t timestamp); HRESULT check_audio_transform_support(const WAVEFORMATEX *input, const WAVEFORMATEX *output); +HRESULT check_video_transform_support(const MFVIDEOFORMAT *input, const MFVIDEOFORMAT *output); HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer); void wg_muxer_destroy(wg_muxer_t muxer); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 56c9fb04f0f..91397da8f69 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -661,6 +661,31 @@ HRESULT check_audio_transform_support(const WAVEFORMATEX *input, const WAVEFORMA return hr; } +HRESULT check_video_transform_support(const MFVIDEOFORMAT *input, const MFVIDEOFORMAT *output) +{ + IMFMediaType *input_type, *output_type; + struct wg_transform_attrs attrs = {0}; + wg_transform_t transform; + HRESULT hr; + + if (FAILED(hr = MFCreateMediaType(&input_type))) + return hr; + if (FAILED(hr = MFCreateMediaType(&output_type))) + { + IMFMediaType_Release(input_type); + return hr; + } + + if (SUCCEEDED(hr = MFInitMediaTypeFromMFVideoFormat(input_type, input, input->dwSize)) + && SUCCEEDED(hr = MFInitMediaTypeFromMFVideoFormat(output_type, output, output->dwSize)) + && SUCCEEDED(hr = wg_transform_create_mf(input_type, output_type, &attrs, &transform))) + wg_transform_destroy(transform); + + IMFMediaType_Release(output_type); + IMFMediaType_Release(input_type); + return hr; +} + #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/video_decoder.c b/dlls/winegstreamer/video_decoder.c index d0ce9b407a8..60eca8ba6bd 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1530,30 +1530,27 @@ static const GUID *const h264_decoder_input_types[] = HRESULT h264_decoder_create(REFIID riid, void **out) { - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, + }; + const MFVIDEOFORMAT input_format = + { + .dwSize = sizeof(MFVIDEOFORMAT), + .guidFormat = MFVideoFormat_H264, }; - static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_VIDEO_H264}; - struct wg_transform_attrs attrs = {0}; struct video_decoder *decoder; - wg_transform_t transform; HRESULT hr; TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support H.264 decoding, please install appropriate plugins\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (FAILED(hr = video_decoder_create_with_types(h264_decoder_input_types, ARRAY_SIZE(h264_decoder_input_types), video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), NULL, &decoder))) @@ -1652,34 +1649,28 @@ static const GUID *const wmv_decoder_output_types[] = HRESULT wmv_decoder_create(IUnknown *outer, IUnknown **out) { - static const struct wg_format input_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO_WMV, - .u.video.format = WG_VIDEO_FORMAT_WMV3, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_WMV3, }; - struct wg_transform_attrs attrs = {0}; struct video_decoder *decoder; - wg_transform_t transform; HRESULT hr; TRACE("outer %p, out %p.\n", outer, out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { - ERR_(winediag)("GStreamer doesn't support WMV decoding, please install appropriate plugins.\n"); - return E_FAIL; + ERR_(winediag)("GStreamer doesn't support WMV decoding, please install appropriate plugins\n"); + return hr; } - wg_transform_destroy(transform); if (FAILED(hr = video_decoder_create_with_types(wmv_decoder_input_types, ARRAY_SIZE(wmv_decoder_input_types), wmv_decoder_output_types, ARRAY_SIZE(wmv_decoder_output_types), outer, &decoder))) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index c4a3fcc6071..0fedfb8451e 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -700,39 +700,28 @@ static const IMFTransformVtbl video_processor_vtbl = HRESULT video_processor_create(REFIID riid, void **ret) { - static const struct wg_format input_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_NV12, }; - struct wg_transform_attrs attrs = {0}; - wg_transform_t transform; struct video_processor *impl; HRESULT hr; TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support video conversion, please install appropriate plugins.\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY;

1 0

Rémi Bernon : winegstreamer: Introduce a new check_audio_transform_support helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: cc82780c22db31fed4da8b84e85c01652a995490 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc82780c22db31fed4da8b84e85c01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 winegstreamer: Introduce a new check_audio_transform_support helper. --- dlls/winegstreamer/aac_decoder.c | 27 ++++----------- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 26 +++++++++++++++ dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/quartz_transform.c | 63 +++++++++-------------------------- dlls/winegstreamer/resampler.c | 29 ++++------------ dlls/winegstreamer/wma_decoder.c | 26 ++++++--------- 7 files changed, 69 insertions(+), 107 deletions(-)

1 0

Rémi Bernon : mf/tests: Test video processor D3D11 awareness.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: c4fb3900bcd84287b4eabe2426f6824d478665d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4fb3900bcd84287b4eabe2426f682… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 10 09:28:45 2024 +0200 mf/tests: Test video processor D3D11 awareness. --- dlls/mf/tests/mf.c | 2 + dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 312 insertions(+)

1 0

Rémi Bernon : winegstreamer: Introduce a new wg_transform_create_mf helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: c1158337ab95462118aef966204597d908d30e59 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1158337ab95462118aef966204597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 winegstreamer: Introduce a new wg_transform_create_mf helper. --- dlls/winegstreamer/aac_decoder.c | 18 ++++-------------- dlls/winegstreamer/color_convert.c | 18 ++++-------------- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 18 ++++++++++++++++++ dlls/winegstreamer/resampler.c | 18 ++++-------------- dlls/winegstreamer/video_decoder.c | 22 ++++------------------ dlls/winegstreamer/video_processor.c | 18 ++++-------------- 7 files changed, 40 insertions(+), 74 deletions(-) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 5844de33ceb..8e5d76f516a 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -73,25 +73,15 @@ static struct aac_decoder *impl_from_IMFTransform(IMFTransform *iface) static HRESULT try_create_wg_transform(struct aac_decoder *decoder) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (decoder->wg_transform) + { wg_transform_destroy(decoder->wg_transform); - decoder->wg_transform = 0; - - mf_media_type_to_wg_format(decoder->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(decoder->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + decoder->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(decoder->input_type, decoder->output_type, &attrs, &decoder->wg_transform); } static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 41e5bcf3b60..b5a1261b669 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -97,25 +97,15 @@ static inline struct color_convert *impl_from_IUnknown(IUnknown *iface) static HRESULT try_create_wg_transform(struct color_convert *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 92805818ff4..c594ab99f3f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -83,6 +83,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate, wg_transform_t wg_transform_create(const struct wg_format *input_format, const struct wg_format *output_format, const struct wg_transform_attrs *attrs); +HRESULT wg_transform_create_mf(IMFMediaType *input_type, IMFMediaType *output_type, + const struct wg_transform_attrs *attrs, wg_transform_t *transform); HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_format, const AM_MEDIA_TYPE *output_format, const struct wg_transform_attrs *attrs, wg_transform_t *transform); void wg_transform_destroy(wg_transform_t transform); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8c5ad931e83..03f8d658fe6 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,6 +31,7 @@ #include "dmoreg.h" #include "gst_guids.h" #include "wmcodecdsp.h" +#include "mferror.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DECLARE_DEBUG_CHANNEL(mfplat); @@ -357,6 +358,23 @@ wg_transform_t wg_transform_create(const struct wg_format *input_format, return params.transform; } +HRESULT wg_transform_create_mf(IMFMediaType *input_type, IMFMediaType *output_type, + const struct wg_transform_attrs *attrs, wg_transform_t *transform) +{ + struct wg_format input_format, output_format; + + mf_media_type_to_wg_format(input_type, &input_format); + if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) + return MF_E_INVALIDMEDIATYPE; + mf_media_type_to_wg_format(output_type, &output_format); + if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) + return MF_E_INVALIDMEDIATYPE; + + if (!(*transform = wg_transform_create(&input_format, &output_format, attrs))) + return E_FAIL; + return S_OK; +} + HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_type, const AM_MEDIA_TYPE *output_type, const struct wg_transform_attrs *attrs, wg_transform_t *transform) { diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index b5b62d58800..12da0d35c8e 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -56,25 +56,15 @@ struct resampler static HRESULT try_create_wg_transform(struct resampler *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static inline struct resampler *impl_from_IUnknown(IUnknown *iface) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 5b5d0ec6d97..d0ce9b407a8 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -245,32 +245,18 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */ - struct wg_format input_format; - struct wg_format output_format; UINT32 low_latency; if (decoder->wg_transform) + { wg_transform_destroy(decoder->wg_transform); - decoder->wg_transform = 0; - - mf_media_type_to_wg_format(decoder->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(decoder->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; + decoder->wg_transform = 0; + } if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency))) decoder->wg_transform_attrs.low_latency = !!low_latency; - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &decoder->wg_transform_attrs))) - { - ERR("Failed to create transform with input major_type %u.\n", input_format.major_type); - return E_FAIL; - } - - return S_OK; + return wg_transform_create_mf(decoder->input_type, decoder->output_type, &decoder->wg_transform_attrs, &decoder->wg_transform); } static HRESULT create_output_media_type(struct video_decoder *decoder, const GUID *subtype, diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index a5f72dd8a86..c4a3fcc6071 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -90,25 +90,15 @@ struct video_processor static HRESULT try_create_wg_transform(struct video_processor *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static HRESULT video_processor_init_allocator(struct video_processor *processor)

1 0

Rémi Bernon : winegstreamer/video_processor: Implement D3D awareness.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: cf3134a841bf2c6a54e3d005c9cc5d05547e84c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3134a841bf2c6a54e3d005c9cc5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 2 21:57:49 2024 +0200 winegstreamer/video_processor: Implement D3D awareness. --- dlls/mf/tests/transform.c | 24 ++++--- dlls/mfreadwrite/tests/mfplat.c | 6 +- dlls/winegstreamer/video_processor.c | 120 ++++++++++++++++++++++++++++++++--- 3 files changed, 127 insertions(+), 23 deletions(-)

1 0