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

Eric Pouech : cmd: Set success/failure return code for CD command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 3852b24b8e479caa888f0737d751b68d73e401c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3852b24b8e479caa888f0737d751b6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 12:11:01 2024 +0200 cmd: Set success/failure return code for CD command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 17 ++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a023ba917c..7b4bc3b61bb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2414,8 +2414,9 @@ void WCMD_endlocal (void) { * Set/Show the current default directory */ -void WCMD_setshow_default (const WCHAR *args) { - +RETURN_CODE WCMD_setshow_default(const WCHAR *args) +{ + RETURN_CODE return_code; BOOL status; WCHAR string[1024]; WCHAR cwd[1024]; @@ -2436,6 +2437,7 @@ void WCMD_setshow_default (const WCHAR *args) { } GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + return_code = NO_ERROR; if (!*args) { lstrcatW(cwd, L"\r\n"); @@ -2466,7 +2468,9 @@ void WCMD_setshow_default (const WCHAR *args) { WCHAR ext[MAX_PATH]; /* Convert path into actual directory spec */ - if (!WCMD_get_fullpath(string, ARRAY_SIZE(fpath), fpath, NULL)) return; + if (!WCMD_get_fullpath(string, ARRAY_SIZE(fpath), fpath, NULL)) + return errorlevel = ERROR_INVALID_FUNCTION; + _wsplitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ @@ -2482,9 +2486,8 @@ void WCMD_setshow_default (const WCHAR *args) { status = SetCurrentDirectoryW(string); if (!status) { - errorlevel = ERROR_INVALID_FUNCTION; WCMD_print_error (); - return; + return_code = ERROR_INVALID_FUNCTION; } else { /* Save away the actual new directory, to store as current location */ @@ -2511,8 +2514,8 @@ void WCMD_setshow_default (const WCHAR *args) { SetEnvironmentVariableW(env, string); } - } - return; + } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ef93def2732..0397311cf85 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -503,10 +503,10 @@ FAILURE 1 FAILURE 1 SUCCESS 0 --- success/failure for CD command -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@SUCCESS 0 +SUCCESS 0 +FAILURE 1 +SUCCESS 0 +SUCCESS 0 --- success/failure for PUSHD/POPD commands @todo_wine(a)SUCCESS 0 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8fe2eb3f322..f538d3069bb 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -194,7 +194,7 @@ RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); void WCMD_setlocal (const WCHAR *args); void WCMD_setshow_date (void); -void WCMD_setshow_default (const WCHAR *args); +RETURN_CODE WCMD_setshow_default(const WCHAR *args); void WCMD_setshow_env (WCHAR *command); void WCMD_setshow_path (const WCHAR *args); void WCMD_setshow_prompt (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ededdcd2177..2228593157e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1814,7 +1814,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_CD: case WCMD_CHDIR: - WCMD_setshow_default (parms_start); + return_code = WCMD_setshow_default(parms_start); break; case WCMD_CLS: WCMD_clear_screen ();

1 0

Eric Pouech : cmd: Set success/failure return code for DIR command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: c88789c89b1b4d89ce4fa0fcbd65e7a0aa57ebef URL: https://gitlab.winehq.org/wine/wine/-/commit/c88789c89b1b4d89ce4fa0fcbd65e7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:54:53 2024 +0200 cmd: Set success/failure return code for DIR command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/directory.c | 23 ++++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 72542538d5b..fdcae9f6a94 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -631,7 +631,7 @@ static void init_time_format(void) * */ -void WCMD_directory (WCHAR *args) +RETURN_CODE WCMD_directory(WCHAR *args) { WCHAR path[MAX_PATH], cwd[MAX_PATH]; DWORD status; @@ -649,6 +649,7 @@ void WCMD_directory (WCHAR *args) WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; + unsigned num_empty = 0, num_with_data = 0; errorlevel = NO_ERROR; @@ -736,8 +737,7 @@ void WCMD_directory (WCHAR *args) } else { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } break; case 'O': p = p + 1; @@ -756,8 +756,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } p++; } @@ -787,8 +786,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Keep running list of bits we care about */ @@ -806,8 +804,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } p = p + 1; } @@ -957,6 +954,10 @@ void WCMD_directory (WCHAR *args) errorlevel = NO_ERROR; prevEntry = thisEntry; thisEntry = WCMD_list_directory (thisEntry, 0); + if (errorlevel) + num_empty++; + else + num_with_data++; } /* Trailer Information */ @@ -964,6 +965,8 @@ void WCMD_directory (WCHAR *args) WCMD_dir_trailer(prevEntry->dirName); } + if (num_empty && !num_with_data) + errorlevel = ERROR_INVALID_FUNCTION; exit: if (paged_mode) WCMD_leave_paged_mode(); @@ -975,4 +978,6 @@ exit: free(prevEntry->fileName); free(prevEntry); } + + return errorlevel; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0397311cf85..8d5926580d9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -514,11 +514,11 @@ SUCCESS 0 @todo_wine(a)SUCCESS 666 @todo_wine(a)FAILURE 1 @todo_wine(a)--- success/failure for DIR command -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 SUCCESS 0 SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 @todo_wine(a)--- ------------ Testing 'set' ------------ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index f538d3069bb..0ca14e9f2ac 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -169,7 +169,7 @@ void WCMD_color (void); RETURN_CODE WCMD_copy(WCHAR *); RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); -void WCMD_directory (WCHAR *); +RETURN_CODE WCMD_directory(WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2228593157e..dc7da5979be 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1833,7 +1833,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_delete(parms_start); break; case WCMD_DIR: - WCMD_directory (parms_start); + return_code = WCMD_directory(parms_start); break; case WCMD_ECHO: return_code = WCMD_echo(&whichcmd[count]);

1 0

Eric Pouech : cmd: Set success/failure return code for PUSHD command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 44e8133f4f45848367ff35545554958ae4f5adc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/44e8133f4f45848367ff3554555495… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 13:04:28 2024 +0200 cmd: Set success/failure return code for PUSHD command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 20 +++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7b4bc3b61bb..6e0a7830900 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1875,15 +1875,19 @@ RETURN_CODE WCMD_goto(void) * Push a directory onto the stack */ -void WCMD_pushd (const WCHAR *args) +RETURN_CODE WCMD_pushd(const WCHAR *args) { struct env_stack *curdir; WCHAR *thisdir; + RETURN_CODE return_code; + + if (!*args) + return errorlevel = NO_ERROR; if (wcschr(args, '/') != NULL) { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } curdir = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); @@ -1892,18 +1896,19 @@ void WCMD_pushd (const WCHAR *args) LocalFree(curdir); LocalFree(thisdir); WINE_ERR ("out of memory\n"); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Change directory using CD code with /D parameter */ lstrcpyW(quals, L"/D"); GetCurrentDirectoryW (1024, thisdir); - errorlevel = NO_ERROR; - WCMD_setshow_default(args); - if (errorlevel) { + + return_code = WCMD_setshow_default(args); + if (return_code != NO_ERROR) + { LocalFree(curdir); LocalFree(thisdir); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } else { curdir -> next = pushd_directories; curdir -> strings = thisdir; @@ -1914,6 +1919,7 @@ void WCMD_pushd (const WCHAR *args) } pushd_directories = curdir; } + return errorlevel = return_code; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8d5926580d9..eb6abb14dea 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -508,12 +508,12 @@ FAILURE 1 SUCCESS 0 SUCCESS 0 --- success/failure for PUSHD/POPD commands -(a)todo_wine@SUCCESS 0 SUCCESS 0 +SUCCESS 0 +FAILURE 1 +SUCCESS 666 @todo_wine(a)FAILURE 1 -(a)todo_wine@SUCCESS 666 -(a)todo_wine@FAILURE 1 -(a)todo_wine@--- success/failure for DIR command +--- success/failure for DIR command FAILURE 1 FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0ca14e9f2ac..93620f05656 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -188,7 +188,7 @@ void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); -void WCMD_pushd (const WCHAR *args); +RETURN_CODE WCMD_pushd(const WCHAR *args); void WCMD_remove_dir (WCHAR *command); RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index dc7da5979be..f8a08878fcb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1909,7 +1909,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_volume (FALSE, parms_start); break; case WCMD_PUSHD: - WCMD_pushd(parms_start); + return_code = WCMD_pushd(parms_start); break; case WCMD_POPD: WCMD_popd();

1 0

Alex Henrie : msi: Initialize size argument to RegGetValueW.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 55525875a5453c9fd2fc7610e3c17839b7bb9d5f URL: https://gitlab.winehq.org/wine/wine/-/commit/55525875a5453c9fd2fc7610e3c178… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 2 23:40:00 2024 -0600 msi: Initialize size argument to RegGetValueW. --- dlls/msi/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 149f9cf9945..ad220eaa756 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1846,6 +1846,7 @@ static UINT check_product_patches(const WCHAR *prodcode, const WCHAR *usersid, M RegOpenKeyExW(localprod, L"Patches", 0, KEY_READ, &localpatch) == ERROR_SUCCESS && RegOpenKeyExW(localpatch, ptr, 0, KEY_READ, &patchkey) == ERROR_SUCCESS) { + size = sizeof(state); res = RegGetValueW(patchkey, NULL, L"State", RRF_RT_REG_DWORD, &type, &state, &size);

1 0

Alex Henrie : shell32: Pass size in bytes to RegGetValueW.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 00759195ccd89b04679163545f9688bdd1c6a4cd URL: https://gitlab.winehq.org/wine/wine/-/commit/00759195ccd89b04679163545f9688… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 2 23:40:00 2024 -0600 shell32: Pass size in bytes to RegGetValueW. --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 928cadfc77c..bc3cb000f0e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -588,7 +588,7 @@ static HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, IPersistFile *persist_file; char extensionA[20]; WCHAR extensionW[20], buf[MAX_PATH]; - DWORD size = MAX_PATH; + DWORD size = sizeof(buf); STRRET path; WCHAR *file; GUID guid;

1 0

Alex Henrie : twinapi.appcore: Initialize size argument to RegGetValueW.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 2011a9cb4dba97a920b9859c4ebe22d57142f0a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2011a9cb4dba97a920b9859c4ebe22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 2 23:51:47 2024 -0600 twinapi.appcore: Initialize size argument to RegGetValueW. --- dlls/twinapi.appcore/analytics_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/twinapi.appcore/analytics_info.c b/dlls/twinapi.appcore/analytics_info.c index abbdb621e1d..baaa92ae49e 100644 --- a/dlls/twinapi.appcore/analytics_info.c +++ b/dlls/twinapi.appcore/analytics_info.c @@ -97,7 +97,7 @@ static HRESULT WINAPI analytics_version_info_get_DeviceFamily( IAnalyticsVersion static HRESULT WINAPI analytics_version_info_get_DeviceFamilyVersion( IAnalyticsVersionInfo *iface, HSTRING *value ) { - DWORD revision, size; + DWORD revision, size = sizeof(revision); WCHAR buffer[32]; UINT64 version; UINT len;

1 0

Rémi Bernon : winegstreamer: Only use pool and set buffer meta for raw video frames.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 81cc44ae111e2556210bb236b75a655dd5ef65ac URL: https://gitlab.winehq.org/wine/wine/-/commit/81cc44ae111e2556210bb236b75a65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 2 09:21:27 2024 +0200 winegstreamer: Only use pool and set buffer meta for raw video frames. --- dlls/winegstreamer/wg_transform.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 614125522a8..018131f4f97 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -131,6 +131,7 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, gsize plane_align = transform->attrs.output_plane_align; GstStructure *config, *params; GstVideoAlignment align; + const char *mime_type; gboolean needs_pool; GstBufferPool *pool; GstVideoInfo info; @@ -139,7 +140,9 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query); gst_query_parse_allocation(query, &caps, &needs_pool); - if (stream_type_from_caps(caps) != GST_STREAM_TYPE_VIDEO || !needs_pool) + + mime_type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + if (strcmp(mime_type, "video/x-raw") || !needs_pool) return false; if (!gst_video_info_from_caps(&info, caps) @@ -912,6 +915,7 @@ NTSTATUS wg_transform_read_data(void *args) struct wg_sample *sample = params->sample; GstVideoAlignment align = {0}; GstBuffer *output_buffer; + const char *output_mime; GstCaps *output_caps; bool discard_data; NTSTATUS status; @@ -927,8 +931,9 @@ NTSTATUS wg_transform_read_data(void *args) output_buffer = gst_sample_get_buffer(transform->output_sample); output_caps = gst_sample_get_caps(transform->output_sample); + output_mime = gst_structure_get_name(gst_caps_get_structure(output_caps, 0)); - if (stream_type_from_caps(output_caps) == GST_STREAM_TYPE_VIDEO) + if (!strcmp(output_mime, "video/x-raw")) { gsize plane_align = transform->attrs.output_plane_align; @@ -949,7 +954,7 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_SUCCESS; } - if (stream_type_from_caps(output_caps) == GST_STREAM_TYPE_VIDEO) + if (!strcmp(output_mime, "video/x-raw")) status = read_transform_output_video(sample, output_buffer, &src_video_info, &dst_video_info); else

1 0

Rémi Bernon : winegstreamer: Use a new wg_video_buffer_pool class to add buffer meta.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 644cc11653dbdf8c1e9f703462339e731ac6da38 URL: https://gitlab.winehq.org/wine/wine/-/commit/644cc11653dbdf8c1e9f703462339e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 2 09:21:55 2024 +0200 winegstreamer: Use a new wg_video_buffer_pool class to add buffer meta. --- dlls/winegstreamer/wg_transform.c | 84 +++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 018131f4f97..a6f12d41080 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -82,6 +82,57 @@ static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVi gst_video_info_align(info, align); } +typedef struct +{ + GstVideoBufferPool parent; + GstVideoInfo info; +} WgVideoBufferPool; + +typedef struct +{ + GstVideoBufferPoolClass parent_class; +} WgVideoBufferPoolClass; + +G_DEFINE_TYPE(WgVideoBufferPool, wg_video_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL); + +static void wg_video_buffer_pool_init(WgVideoBufferPool *pool) +{ +} + +static void wg_video_buffer_pool_class_init(WgVideoBufferPoolClass *klass) +{ +} + +static WgVideoBufferPool *wg_video_buffer_pool_create(GstCaps *caps, gsize plane_align, + GstAllocator *allocator, GstVideoAlignment *align) +{ + WgVideoBufferPool *pool; + GstStructure *config; + + if (!(pool = g_object_new(wg_video_buffer_pool_get_type(), NULL))) + return NULL; + + gst_video_info_from_caps(&pool->info, caps); + align_video_info_planes(plane_align, &pool->info, align); + + if (!(config = gst_buffer_pool_get_config(GST_BUFFER_POOL(pool)))) + GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool); + else + { + gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META); + gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); + gst_buffer_pool_config_set_video_alignment(config, align); + + gst_buffer_pool_config_set_params(config, caps, pool->info.size, 0, 0); + gst_buffer_pool_config_set_allocator(config, allocator, NULL); + if (!gst_buffer_pool_set_config(GST_BUFFER_POOL(pool), config)) + GST_ERROR("Failed to set %"GST_PTR_FORMAT" config.", pool); + } + + GST_INFO("Created %"GST_PTR_FORMAT, pool); + return pool; +} + static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); @@ -128,13 +179,11 @@ static gboolean transform_src_query_cb(GstPad *pad, GstObject *parent, GstQuery static gboolean transform_sink_query_allocation(struct wg_transform *transform, GstQuery *query) { - gsize plane_align = transform->attrs.output_plane_align; - GstStructure *config, *params; + WgVideoBufferPool *pool; GstVideoAlignment align; const char *mime_type; + GstStructure *params; gboolean needs_pool; - GstBufferPool *pool; - GstVideoInfo info; GstCaps *caps; GST_LOG("transform %p, %"GST_PTR_FORMAT, transform, query); @@ -145,12 +194,10 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, if (strcmp(mime_type, "video/x-raw") || !needs_pool) return false; - if (!gst_video_info_from_caps(&info, caps) - || !(pool = gst_video_buffer_pool_new())) + if (!(pool = wg_video_buffer_pool_create(caps, transform->attrs.output_plane_align, + transform->allocator, &align))) return false; - align_video_info_planes(plane_align, &info, &align); - if ((params = gst_structure_new("video-meta", "padding-top", G_TYPE_UINT, align.padding_top, "padding-bottom", G_TYPE_UINT, align.padding_bottom, @@ -162,30 +209,15 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, gst_structure_free(params); } - if (!(config = gst_buffer_pool_get_config(pool))) - GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool); - else - { - gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_META); - gst_buffer_pool_config_add_option(config, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); - gst_buffer_pool_config_set_video_alignment(config, &align); - - gst_buffer_pool_config_set_params(config, caps, - info.size, 0, 0); - gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL); - if (!gst_buffer_pool_set_config(pool, config)) - GST_ERROR("Failed to set %"GST_PTR_FORMAT" config.", pool); - } - /* Prevent pool reconfiguration, we don't want another alignment. */ - if (!gst_buffer_pool_set_active(pool, true)) + if (!gst_buffer_pool_set_active(GST_BUFFER_POOL(pool), true)) GST_ERROR("%"GST_PTR_FORMAT" failed to activate.", pool); - gst_query_add_allocation_pool(query, pool, info.size, 0, 0); + gst_query_add_allocation_pool(query, GST_BUFFER_POOL(pool), pool->info.size, 0, 0); gst_query_add_allocation_param(query, transform->allocator, NULL); GST_INFO("Proposing %"GST_PTR_FORMAT", buffer size %#zx, %"GST_PTR_FORMAT", for %"GST_PTR_FORMAT, - pool, info.size, transform->allocator, query); + pool, pool->info.size, transform->allocator, query); g_object_unref(pool); return true;

1 0

Rémi Bernon : winegstreamer: Keep the input caps on the transform.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 8ba713d6b80f3abbf32d573c8837ec3be30d784f URL: https://gitlab.winehq.org/wine/wine/-/commit/8ba713d6b80f3abbf32d573c8837ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 12 18:20:48 2024 +0100 winegstreamer: Keep the input caps on the transform. --- dlls/winegstreamer/wg_transform.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index a6f12d41080..ac036fcce59 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -61,6 +61,7 @@ struct wg_transform bool output_caps_changed; GstCaps *desired_caps; GstCaps *output_caps; + GstCaps *input_caps; }; static struct wg_transform *get_transform(wg_transform_t trans) @@ -365,6 +366,7 @@ NTSTATUS wg_transform_destroy(void *args) gst_query_unref(transform->drain_query); gst_caps_unref(transform->desired_caps); gst_caps_unref(transform->output_caps); + gst_caps_unref(transform->input_caps); gst_atomic_queue_unref(transform->output_queue); free(transform); @@ -405,7 +407,7 @@ NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; GstElement *first = NULL, *last = NULL, *element; - GstCaps *sink_caps = NULL, *src_caps = NULL, *parsed_caps = NULL; + GstCaps *sink_caps = NULL, *parsed_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; const gchar *input_mime, *output_mime; GstPadTemplate *template = NULL; @@ -427,27 +429,31 @@ NTSTATUS wg_transform_create(void *args) goto out; transform->attrs = params->attrs; + if (!(transform->input_caps = caps_from_media_type(&params->input_type))) + goto out; + GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, transform->input_caps); + input_mime = gst_structure_get_name(gst_caps_get_structure(transform->input_caps, 0)); + + if (!(transform->output_caps = caps_from_media_type(&params->output_type))) + goto out; + GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps); + output_mime = gst_structure_get_name(gst_caps_get_structure(transform->output_caps, 0)); + if (IsEqualGUID(&params->input_type.major, &MFMediaType_Video)) transform->input_info = params->input_type.u.video->videoInfo; if (IsEqualGUID(&params->output_type.major, &MFMediaType_Video)) output_info = params->output_type.u.video->videoInfo; - if (!(src_caps = caps_from_media_type(&params->input_type))) - goto out; - if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) + if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, transform->input_caps))) goto out; transform->my_src = gst_pad_new_from_template(template, "src"); g_object_unref(template); if (!transform->my_src) goto out; - GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, src_caps); - gst_pad_set_element_private(transform->my_src, transform); gst_pad_set_query_function(transform->my_src, transform_src_query_cb); - if (!(transform->output_caps = caps_from_media_type(&params->output_type))) - goto out; transform->desired_caps = gst_caps_ref(transform->output_caps); if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->output_caps))) goto out; @@ -456,34 +462,30 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_sink) goto out; - GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps); - gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); - input_mime = gst_structure_get_name(gst_caps_get_structure(src_caps, 0)); - if (!(parsed_caps = transform_get_parsed_caps(src_caps, input_mime))) + if (!(parsed_caps = transform_get_parsed_caps(transform->input_caps, input_mime))) goto out; /* Since we append conversion elements, we don't want to filter decoders * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - output_mime = gst_structure_get_name(gst_caps_get_structure(transform->output_caps, 0)); if (!(sink_caps = gst_caps_new_empty_simple(output_mime))) goto out; if (strcmp(input_mime, "audio/x-raw") && strcmp(input_mime, "video/x-raw")) { - if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, src_caps, parsed_caps)) + if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, transform->input_caps, parsed_caps)) && !append_element(transform->container, element, &first, &last)) goto out; else if (!element) { gst_caps_unref(parsed_caps); - parsed_caps = gst_caps_ref(src_caps); + parsed_caps = gst_caps_ref(transform->input_caps); } if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, parsed_caps, sink_caps)) @@ -560,7 +562,7 @@ NTSTATUS wg_transform_create(void *args) if (!(event = gst_event_new_stream_start("stream")) || !push_event(transform->my_src, event)) goto out; - if (!(event = gst_event_new_caps(src_caps)) + if (!(event = gst_event_new_caps(transform->input_caps)) || !push_event(transform->my_src, event)) goto out; @@ -574,7 +576,6 @@ NTSTATUS wg_transform_create(void *args) goto out; gst_caps_unref(parsed_caps); - gst_caps_unref(src_caps); gst_caps_unref(sink_caps); GST_INFO("Created winegstreamer transform %p.", transform); @@ -590,8 +591,8 @@ out: gst_caps_unref(transform->output_caps); if (transform->my_src) gst_object_unref(transform->my_src); - if (src_caps) - gst_caps_unref(src_caps); + if (transform->input_caps) + gst_caps_unref(transform->input_caps); if (parsed_caps) gst_caps_unref(parsed_caps); if (sink_caps)

1 0

Rémi Bernon : winegstreamer: Use video info stride in buffer meta rather than videoflip.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: b7dbd33b9876047af19983ca724db807842f4b00 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7dbd33b9876047af19983ca724db8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 12 18:20:48 2024 +0100 winegstreamer: Use video info stride in buffer meta rather than videoflip. --- dlls/winegstreamer/wg_transform.c | 108 +++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index ac036fcce59..2537331a118 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -53,8 +53,8 @@ struct wg_transform GstQuery *drain_query; GstAtomicQueue *input_queue; - GstElement *video_flip; MFVideoInfo input_info; + MFVideoInfo output_info; GstAtomicQueue *output_queue; GstSample *output_sample; @@ -69,7 +69,8 @@ static struct wg_transform *get_transform(wg_transform_t trans) return (struct wg_transform *)(ULONG_PTR)trans; } -static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align) +static void align_video_info_planes(MFVideoInfo *video_info, gsize plane_align, + GstVideoInfo *info, GstVideoAlignment *align) { gst_video_alignment_reset(align); @@ -81,6 +82,15 @@ static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVi align->stride_align[3] = plane_align; gst_video_info_align(info, align); + + if (video_info->VideoFlags & MFVideoFlag_BottomUpLinearRep) + { + for (guint i = 0; i < ARRAY_SIZE(info->offset); ++i) + { + info->offset[i] += (info->height - 1) * info->stride[i]; + info->stride[i] = -info->stride[i]; + } + } } typedef struct @@ -96,16 +106,53 @@ typedef struct G_DEFINE_TYPE(WgVideoBufferPool, wg_video_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL); +static void buffer_add_video_meta(GstBuffer *buffer, GstVideoInfo *info) +{ + GstVideoMeta *meta; + + if (!(meta = gst_buffer_get_video_meta(buffer))) + meta = gst_buffer_add_video_meta(buffer, GST_VIDEO_FRAME_FLAG_NONE, + info->finfo->format, info->width, info->height); + + if (!meta) + GST_ERROR("Failed to add video meta to buffer %"GST_PTR_FORMAT, buffer); + else + { + memcpy(meta->offset, info->offset, sizeof(info->offset)); + memcpy(meta->stride, info->stride, sizeof(info->stride)); + } +} + +static GstFlowReturn wg_video_buffer_pool_alloc_buffer(GstBufferPool *gst_pool, GstBuffer **buffer, + GstBufferPoolAcquireParams *params) +{ + GstBufferPoolClass *parent_class = GST_BUFFER_POOL_CLASS(wg_video_buffer_pool_parent_class); + WgVideoBufferPool *pool = (WgVideoBufferPool *)gst_pool; + GstFlowReturn ret; + + GST_LOG("%"GST_PTR_FORMAT", buffer %p, params %p", pool, buffer, params); + + if (!(ret = parent_class->alloc_buffer(gst_pool, buffer, params))) + { + buffer_add_video_meta(*buffer, &pool->info); + GST_INFO("%"GST_PTR_FORMAT" allocated buffer %"GST_PTR_FORMAT, pool, *buffer); + } + + return ret; +} + static void wg_video_buffer_pool_init(WgVideoBufferPool *pool) { } static void wg_video_buffer_pool_class_init(WgVideoBufferPoolClass *klass) { + GstBufferPoolClass *pool_class = GST_BUFFER_POOL_CLASS(klass); + pool_class->alloc_buffer = wg_video_buffer_pool_alloc_buffer; } static WgVideoBufferPool *wg_video_buffer_pool_create(GstCaps *caps, gsize plane_align, - GstAllocator *allocator, GstVideoAlignment *align) + GstAllocator *allocator, MFVideoInfo *video_info, GstVideoAlignment *align) { WgVideoBufferPool *pool; GstStructure *config; @@ -114,7 +161,7 @@ static WgVideoBufferPool *wg_video_buffer_pool_create(GstCaps *caps, gsize plane return NULL; gst_video_info_from_caps(&pool->info, caps); - align_video_info_planes(plane_align, &pool->info, align); + align_video_info_planes(video_info, plane_align, &pool->info, align); if (!(config = gst_buffer_pool_get_config(GST_BUFFER_POOL(pool)))) GST_ERROR("Failed to get %"GST_PTR_FORMAT" config.", pool); @@ -196,7 +243,7 @@ static gboolean transform_sink_query_allocation(struct wg_transform *transform, return false; if (!(pool = wg_video_buffer_pool_create(caps, transform->attrs.output_plane_align, - transform->allocator, &align))) + transform->allocator, &transform->output_info, &align))) return false; if ((params = gst_structure_new("video-meta", @@ -412,7 +459,6 @@ NTSTATUS wg_transform_create(void *args) const gchar *input_mime, *output_mime; GstPadTemplate *template = NULL; struct wg_transform *transform; - MFVideoInfo output_info = {0}; GstEvent *event; if (!(transform = calloc(1, sizeof(*transform)))) @@ -442,7 +488,7 @@ NTSTATUS wg_transform_create(void *args) if (IsEqualGUID(&params->input_type.major, &MFMediaType_Video)) transform->input_info = params->input_type.u.video->videoInfo; if (IsEqualGUID(&params->output_type.major, &MFMediaType_Video)) - output_info = params->output_type.u.video->videoInfo; + transform->output_info = params->output_type.u.video->videoInfo; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, transform->input_caps))) goto out; @@ -529,15 +575,6 @@ NTSTATUS wg_transform_create(void *args) } else { - if (!(element = create_element("videoconvert", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; - if (!(transform->video_flip = create_element("videoflip", "base")) - || !append_element(transform->container, transform->video_flip, &first, &last)) - goto out; - - if ((transform->input_info.VideoFlags ^ output_info.VideoFlags) & MFVideoFlag_BottomUpLinearRep) - gst_util_set_object_arg(G_OBJECT(transform->video_flip), "method", "vertical-flip"); if (!(element = create_element("videoconvert", "base")) || !append_element(transform->container, element, &first, &last)) goto out; @@ -635,19 +672,18 @@ NTSTATUS wg_transform_set_output_type(void *args) { struct wg_transform_set_output_type_params *params = args; struct wg_transform *transform = get_transform(params->transform); - MFVideoInfo output_info = {0}; GstCaps *caps, *stripped; GstSample *sample; - if (IsEqualGUID(&params->media_type.major, &MFMediaType_Video)) - output_info = params->media_type.u.video->videoInfo; - if (!(caps = caps_from_media_type(&params->media_type))) { GST_ERROR("Failed to convert media type to caps."); return STATUS_UNSUCCESSFUL; } + if (IsEqualGUID(&params->media_type.major, &MFMediaType_Video)) + transform->output_info = params->media_type.u.video->videoInfo; + GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, caps); stripped = caps_strip_fields(caps, transform->attrs.allow_format_change); @@ -668,16 +704,6 @@ NTSTATUS wg_transform_set_output_type(void *args) gst_caps_unref(transform->desired_caps); transform->desired_caps = caps; - if (transform->video_flip) - { - const char *value; - - if ((transform->input_info.VideoFlags ^ output_info.VideoFlags) & MFVideoFlag_BottomUpLinearRep) - value = "vertical-flip"; - else - value = "none"; - gst_util_set_object_arg(G_OBJECT(transform->video_flip), "method", value); - } if (!push_event(transform->my_sink, gst_event_new_reconfigure())) { GST_ERROR("Failed to reconfigure transform %p.", transform); @@ -711,6 +737,8 @@ NTSTATUS wg_transform_push_data(void *args) struct wg_transform_push_data_params *params = args; struct wg_transform *transform = get_transform(params->transform); struct wg_sample *sample = params->sample; + const gchar *input_mime; + GstVideoInfo video_info; GstBuffer *buffer; guint length; @@ -734,6 +762,14 @@ NTSTATUS wg_transform_push_data(void *args) GST_INFO("Wrapped %u/%u bytes from sample %p to %"GST_PTR_FORMAT, sample->size, sample->max_size, sample, buffer); } + input_mime = gst_structure_get_name(gst_caps_get_structure(transform->input_caps, 0)); + if (!strcmp(input_mime, "video/x-raw") && gst_video_info_from_caps(&video_info, transform->input_caps)) + { + GstVideoAlignment align; + align_video_info_planes(&transform->input_info, 0, &video_info, &align); + buffer_add_video_meta(buffer, &video_info); + } + if (sample->flags & WG_SAMPLE_FLAG_HAS_PTS) GST_BUFFER_PTS(buffer) = sample->pts * 100; if (sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) @@ -969,13 +1005,21 @@ NTSTATUS wg_transform_read_data(void *args) if (!strcmp(output_mime, "video/x-raw")) { gsize plane_align = transform->attrs.output_plane_align; + GstVideoMeta *meta; if (!gst_video_info_from_caps(&src_video_info, output_caps)) GST_ERROR("Failed to get video info from %"GST_PTR_FORMAT, output_caps); dst_video_info = src_video_info; - /* set the desired output buffer alignment on the dest video info */ - align_video_info_planes(plane_align, &dst_video_info, &align); + /* set the desired output buffer alignment and stride on the dest video info */ + align_video_info_planes(&transform->output_info, plane_align, &dst_video_info, &align); + + /* copy the actual output buffer alignment and stride to the src video info */ + if ((meta = gst_buffer_get_video_meta(output_buffer))) + { + memcpy(src_video_info.offset, meta->offset, sizeof(meta->offset)); + memcpy(src_video_info.stride, meta->stride, sizeof(meta->stride)); + } } if (GST_MINI_OBJECT_FLAG_IS_SET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED))

1 0