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

Eric Pouech : cmd: Improve return code/errorlevel support for external commands.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 25275895273360f70969d0dca88be3d3d49524a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/25275895273360f70969d0dca88be3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 10:21:30 2024 +0200 cmd: Improve return code/errorlevel support for external commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 31 ++++++++++++++----------------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d028c3fe1e6..a96c7dde10b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -466,9 +466,9 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for external command -(a)todo_wine@FAILURE 1 +FAILURE 1 @todo_wine(a)ERRORLEVEL 3 -(a)todo_wine@FAILURE 1 +FAILURE 1 ERRORLEVEL 9009 foo(a)space@ SUCCESS 0 @@ -482,7 +482,7 @@ foo(a)space@ SUCCESS 0 foo(a)space@ FAILURE 1025 -(a)todo_wine@FAILURE 2 +FAILURE 2 --- success/failure for START command @todo_wine(a)FAILURE 1 foo(a)space@ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c61f9b41cd5..dfa4c00e4cd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -193,7 +193,7 @@ void WCMD_print_error (void); RETURN_CODE WCMD_pushd(const WCHAR *args); RETURN_CODE WCMD_remove_dir(WCHAR *command); RETURN_CODE WCMD_rename(void); -void WCMD_run_program (WCHAR *command, BOOL called); +RETURN_CODE WCMD_run_program (WCHAR *command, BOOL called); RETURN_CODE WCMD_setlocal(WCHAR *args); RETURN_CODE WCMD_setshow_date(void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 53b08c0b137..d53072ca567 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1413,7 +1413,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command); * so go back through wcmd_execute. */ -void WCMD_run_program (WCHAR *command, BOOL called) +RETURN_CODE WCMD_run_program(WCHAR *command, BOOL called) { WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; @@ -1432,7 +1432,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); - if (!firstParam[0]) return; + if (!firstParam[0]) return NO_ERROR; /* Calculate the search path and stem to search for */ if (wcspbrk(firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */ @@ -1445,7 +1445,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (lstrlenW(firstParam) >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); - return; + return ERROR_INVALID_FUNCTION; } lstrcpyW(stemofsearch, firstParam); @@ -1453,7 +1453,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } else { /* Convert eg. ..\fred to include a directory by removing file part */ - if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) return; + if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) + return ERROR_INVALID_FUNCTION; lastSlash = wcsrchr(pathtosearch, '\\'); if (lastSlash && wcschr(lastSlash, '.') != NULL) extensionsupplied = TRUE; lstrcpyW(stemofsearch, lastSlash+1); @@ -1527,7 +1528,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Since you can have eg. ..\.. on the path, need to expand to full information */ - if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) return; + if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) + return ERROR_INVALID_FUNCTION; } /* 1. If extension supplied, see if that file exists */ @@ -1600,7 +1602,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) } if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) errorlevel = return_code; - return; + return return_code; } else { DWORD exit_code; /* thisDir contains the file to be launched, but with what? @@ -1625,8 +1627,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* strip first and last quote WCHARacters and try again */ WCMD_strip_quotes(command); opt_s = TRUE; - WCMD_run_program(command, called); - return; + return WCMD_run_program(command, called); } if (!status) @@ -1641,16 +1642,14 @@ void WCMD_run_program (WCHAR *command, BOOL called) CloseHandle(pe.hProcess); CloseHandle(pe.hThread); - return; + return errorlevel; } } } /* Not found anywhere - were we called? */ - if (called) { - execute_single_command(command); - return; - } + if (called) + return errorlevel = execute_single_command(command); /* Not found anywhere - give up */ WCMD_output_stderr(WCMD_LoadMessage(WCMD_NO_COMMAND_FOUND), command); @@ -1658,8 +1657,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* If a command fails to launch, it sets errorlevel 9009 - which does not seem to have any associated constant definition */ errorlevel = RETURN_CODE_CANT_LAUNCH; - return; - + return ERROR_INVALID_FUNCTION; } /* this is obviously wrong... will require more work to be fixed */ @@ -1931,8 +1929,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; default: prev_echo_mode = echo_mode; - WCMD_run_program (whichcmd, FALSE); - return_code = errorlevel; + return_code = WCMD_run_program(whichcmd, FALSE); echo_mode = prev_echo_mode; }

1 0

Eric Pouech : cmd: Cleanup transition bits.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: dfa157f831dc481d6b0294c5623b1fb67058d598 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfa157f831dc481d6b0294c5623b1f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 15:09:07 2024 +0200 cmd: Cleanup transition bits. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 2 -- programs/cmd/wcmdmain.c | 22 ++-------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index dfa4c00e4cd..6c25b86f7d1 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -156,8 +156,6 @@ typedef int RETURN_CODE; #define RETURN_CODE_SYNTAX_ERROR 255 #define RETURN_CODE_CANT_LAUNCH 9009 #define RETURN_CODE_ABORTED (-999999) -/* temporary to detect builtin commands not migrated to handle return code */ -#define RETURN_CODE_OLD_CHAINING (-999998) BOOL WCMD_print_volume_information(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d53072ca567..d44a505dc47 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1600,7 +1600,7 @@ RETURN_CODE WCMD_run_program(WCHAR *command, BOOL called) TRACE("Batch completed, but was not 'called' so skipping outer batch too\n"); context->skip_rest = TRUE; } - if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) + if (return_code != RETURN_CODE_ABORTED) errorlevel = return_code; return return_code; } else { @@ -1803,7 +1803,6 @@ static RETURN_CODE execute_single_command(const WCHAR *command) parms_start[count] = '\0'; } - return_code = RETURN_CODE_OLD_CHAINING; switch (cmd_index) { case WCMD_CALL: @@ -1858,6 +1857,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_prompt(); break; case WCMD_REM: + return_code = NO_ERROR; break; case WCMD_REN: case WCMD_RENAME: @@ -3653,16 +3653,6 @@ static RETURN_CODE for_control_execute(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *node return return_code; } -static RETURN_CODE temp_fixup_return_code(CMD_NODE *node, RETURN_CODE return_code, RETURN_CODE fallback_return_code) -{ - if (return_code == RETURN_CODE_OLD_CHAINING) - { - FIXME("Not migrated (%ls) used in chaining\n", node->op == CMD_SINGLE ? node->command->command : L"Too complex"); - return_code = fallback_return_code; - } - return return_code; -} - RETURN_CODE node_execute(CMD_NODE *node) { HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), @@ -3694,22 +3684,16 @@ RETURN_CODE node_execute(CMD_NODE *node) break; case CMD_ONSUCCESS: return_code = node_execute(node->left); - return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR) - { return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); - } break; case CMD_ONFAILURE: return_code = node_execute(node->left); - return_code = temp_fixup_return_code(node->left, return_code, ERROR_INVALID_FUNCTION); if (return_code != NO_ERROR && return_code != RETURN_CODE_ABORTED) { /* that's needed for commands (POPD, RMDIR) that don't set errorlevel in case of failure. */ errorlevel = return_code; return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); } break; case CMD_PIPE: @@ -3744,7 +3728,6 @@ RETURN_CODE node_execute(CMD_NODE *node) CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); SetStdHandle(STD_OUTPUT_HANDLE, saved_output); - return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR) { HANDLE h = CreateFileW(filename, GENERIC_READ, @@ -3754,7 +3737,6 @@ RETURN_CODE node_execute(CMD_NODE *node) { SetStdHandle(STD_INPUT_HANDLE, h); return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); } else return_code = ERROR_INVALID_FUNCTION; }

1 0

Paul Gofman : ntdll: Better track thread pool wait's wait_pending state.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 54579761943c97a18af5f2e288cfee1da8ef2634 URL: https://gitlab.winehq.org/wine/wine/-/commit/54579761943c97a18af5f2e288cfee… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 19:05:00 2024 -0600 ntdll: Better track thread pool wait's wait_pending state. --- dlls/ntdll/threadpool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index c6e40fc78f4..c9c61d582bf 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1265,6 +1265,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) u.wait.wait_entry ) { assert( wait->type == TP_OBJECT_TYPE_WAIT ); + assert( wait->u.wait.wait_pending ); if (wait->u.wait.timeout <= now.QuadPart) { /* Wait object timed out. */ @@ -1272,6 +1273,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { list_remove( &wait->u.wait.wait_entry ); list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry ); + wait->u.wait.wait_pending = FALSE; } if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD))) { @@ -1329,6 +1331,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { list_remove( &wait->u.wait.wait_entry ); list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry ); + wait->u.wait.wait_pending = FALSE; } if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD))) {

1 0

Paul Gofman : ntdll: Make sure wakeups from already unset events are ignored in waitqueue_thread_proc().
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: e105c1987ac8536ab854fdbf25e340e9125792dc URL: https://gitlab.winehq.org/wine/wine/-/commit/e105c1987ac8536ab854fdbf25e340… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 19:14:40 2024 -0600 ntdll: Make sure wakeups from already unset events are ignored in waitqueue_thread_proc(). --- dlls/ntdll/threadpool.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index c9c61d582bf..81cf894d943 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -160,6 +160,7 @@ struct threadpool_object LONG num_pending_callbacks; LONG num_running_callbacks; LONG num_associated_callbacks; + LONG update_serial; /* arguments for callback */ union { @@ -1243,6 +1244,7 @@ static void tp_timerqueue_unlock( struct threadpool_object *timer ) static void CALLBACK waitqueue_thread_proc( void *param ) { struct threadpool_object *objects[MAXIMUM_WAITQUEUE_OBJECTS]; + LONG update_serials[MAXIMUM_WAITQUEUE_OBJECTS]; HANDLE handles[MAXIMUM_WAITQUEUE_OBJECTS + 1]; struct waitqueue_bucket *bucket = param; struct threadpool_object *wait, *next; @@ -1295,6 +1297,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) InterlockedIncrement( &wait->refcount ); objects[num_handles] = wait; handles[num_handles] = wait->u.wait.handle; + update_serials[num_handles] = wait->update_serial; num_handles++; } } @@ -1323,7 +1326,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { wait = objects[status - STATUS_WAIT_0]; assert( wait->type == TP_OBJECT_TYPE_WAIT ); - if (wait->u.wait.bucket) + if (wait->u.wait.bucket && wait->update_serial == update_serials[status - STATUS_WAIT_0]) { /* Wait object signaled. */ assert( wait->u.wait.bucket == bucket ); @@ -1344,7 +1347,10 @@ static void CALLBACK waitqueue_thread_proc( void *param ) else tp_object_submit( wait, TRUE ); } else - WARN("wait object %p triggered while object was destroyed\n", wait); + { + WARN("wait object %p triggered while object was %s.\n", + wait, wait->u.wait.bucket ? "updated" : "destroyed"); + } } /* Release temporary references to wait objects. */ @@ -1917,6 +1923,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->num_pending_callbacks = 0; object->num_running_callbacks = 0; object->num_associated_callbacks = 0; + object->update_serial = 0; if (environment) { @@ -3051,12 +3058,15 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) { struct threadpool_object *this = impl_from_TP_WAIT( wait ); ULONGLONG timestamp = MAXLONGLONG; + BOOL same_handle; TRACE( "%p %p %p\n", wait, handle, timeout ); RtlEnterCriticalSection( &waitqueue.cs ); assert( this->u.wait.bucket ); + + same_handle = this->u.wait.handle == handle; this->u.wait.handle = handle; if (handle || this->u.wait.wait_pending) @@ -3090,6 +3100,8 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) } /* Wake up the wait queue thread. */ + if (!same_handle) + ++this->update_serial; NtSetEvent( bucket->update_event, NULL ); }

1 0

Ziqing Hui : winegstreamer/wg_transform: Support creating encoder transform.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 629a2b3f8cbc928113d503a4236f056b14166134 URL: https://gitlab.winehq.org/wine/wine/-/commit/629a2b3f8cbc928113d503a4236f05… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jul 8 16:43:49 2024 +0800 winegstreamer/wg_transform: Support creating encoder transform. --- dlls/mf/tests/transform.c | 25 ++++++++++----- dlls/winegstreamer/wg_transform.c | 67 +++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ef0bec60ed5..3e902aa67f3 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3910,12 +3910,12 @@ static void test_h264_encoder(void) ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), - ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)), + ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header), .todo = TRUE), ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), ATTR_UINT32(test_attr_guid, 0), {0}, }; - static const MFT_OUTPUT_STREAM_INFO expect_output_info[] = {{.cbSize = 0x8000}, {.cbSize = 0x3bc400}}; + MFT_OUTPUT_STREAM_INFO output_info, expect_output_info[] = {{.cbSize = 0x8000}, {.cbSize = 0x3bc400}}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_NV12}; IMFMediaType *media_type; @@ -3940,10 +3940,7 @@ static void test_h264_encoder(void) check_mft_get_info(class_id, &expect_mft_info); hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); - todo_wine ok(hr == S_OK, "CoCreateInstance returned %#lx.\n", hr); - if (hr != S_OK) - goto failed; check_interface(transform, &IID_IMFTransform, TRUE); check_interface(transform, &IID_IMediaObject, FALSE); @@ -3977,8 +3974,13 @@ static void test_h264_encoder(void) check_mft_set_output_type_required(transform, output_type_desc); check_mft_set_output_type(transform, output_type_desc, S_OK); - check_mft_get_output_current_type(transform, expect_output_type_desc); - check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); + check_mft_get_output_current_type_(__LINE__, transform, expect_output_type_desc, FALSE, TRUE); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); + check_member(output_info, expect_output_info[0], "%#lx", dwFlags); + todo_wine + check_member(output_info, expect_output_info[0], "%#lx", cbSize); + check_member(output_info, expect_output_info[0], "%#lx", cbAlignment); /* Input types can now be enumerated. */ i = -1; @@ -4032,7 +4034,14 @@ static void test_h264_encoder(void) if (IsEqualGUID(test_attributes[i].key, &MF_MT_FRAME_SIZE)) check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[1]); else - check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); + { + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); + check_member(output_info, expect_output_info[0], "%#lx", dwFlags); + todo_wine + check_member(output_info, expect_output_info[0], "%#lx", cbSize); + check_member(output_info, expect_output_info[0], "%#lx", cbAlignment); + } winetest_pop_context(); } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index a30a773ca1e..deb99b78529 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -520,51 +520,47 @@ static bool transform_create_converter_elements(struct wg_transform *transform, if (g_str_has_prefix(output_mime, "audio/")) { - if (strcmp(output_mime, "audio/x-raw")) - { - GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); + /* The MF audio decoder transforms allow decoding to various formats + * as well as resampling the audio at the same time, whereas + * GStreamer decoder plugins usually only support decoding to a + * single format and at the original rate. + * + * The WMA decoder transform also has output samples interleaved on + * Windows, whereas GStreamer avdec_wmav2 output uses + * non-interleaved format. + */ + if (!(element = create_element("audioconvert", "base")) + || !append_element(transform->container, element, first, last)) + return false; + if (!(element = create_element("audioresample", "base")) + || !append_element(transform->container, element, first, last)) return false; - } - else - { - /* The MF audio decoder transforms allow decoding to various formats - * as well as resampling the audio at the same time, whereas - * GStreamer decoder plugins usually only support decoding to a - * single format and at the original rate. - * - * The WMA decoder transform also has output samples interleaved on - * Windows, whereas GStreamer avdec_wmav2 output uses - * non-interleaved format. - */ - if (!(element = create_element("audioconvert", "base")) - || !append_element(transform->container, element, first, last)) - return false; - if (!(element = create_element("audioresample", "base")) - || !append_element(transform->container, element, first, last)) - return false; - } } if (g_str_has_prefix(output_mime, "video/")) { - if (strcmp(output_mime, "video/x-raw")) - { - GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); + if (!(element = create_element("videoconvert", "base")) + || !append_element(transform->container, element, first, last)) return false; - } - else - { - if (!(element = create_element("videoconvert", "base")) - || !append_element(transform->container, element, first, last)) - return false; - /* Let GStreamer choose a default number of threads. */ - gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); - } + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); } return true; } +static bool transform_create_encoder_element(struct wg_transform *transform, + const gchar *output_mime, GstElement **first, GstElement **last) +{ + GstElement *element; + + if (!strcmp(output_mime, "audio/x-raw") || !strcmp(output_mime, "video/x-raw")) + return true; + + return (element = find_element(GST_ELEMENT_FACTORY_TYPE_ENCODER, NULL, transform->output_caps)) + && append_element(transform->container, element, first, last); +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; @@ -627,10 +623,13 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); + /* Create elements. */ if (!transform_create_decoder_elements(transform, input_mime, output_mime, &first, &last)) goto out; if (!transform_create_converter_elements(transform, output_mime, &first, &last)) goto out; + if (!transform_create_encoder_element(transform, output_mime, &first, &last)) + goto out; if (!link_src_to_element(transform->my_src, first)) goto out;

1 0

Hans Leidekker : odbc32: Implement SQLSetEnvAttr(SQL_ATTR_ODBC_VERSION).
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: b5710c548d9652bf1481601598e1313b79bcbc61 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5710c548d9652bf1481601598e131… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 10:16:50 2024 +0200 odbc32: Implement SQLSetEnvAttr(SQL_ATTR_ODBC_VERSION). --- dlls/odbc32/proxyodbc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/odbc32/tests/odbc32.c | 25 +++++++++++++++++++++ dlls/odbc32/unixlib.h | 2 ++ 3 files changed, 79 insertions(+), 2 deletions(-)

1 0

Marc-Aurel Zent : ntdll: Prefer futex for thread-ID alerts over kqueue.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: e200e0194e6b1b9d5abae0c5f33ce72aa20849ce URL: https://gitlab.winehq.org/wine/wine/-/commit/e200e0194e6b1b9d5abae0c5f33ce7… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Tue Mar 5 13:05:21 2024 +0100 ntdll: Prefer futex for thread-ID alerts over kqueue. --- dlls/ntdll/unix/sync.c | 122 ++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 68 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1d66f0d974f..1cad7dc8662 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2409,10 +2409,10 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { -#ifdef HAVE_KQUEUE - int kq; -#elif defined(__linux__) +#ifdef __linux__ LONG futex; +#elif defined(HAVE_KQUEUE) + int kq; #else HANDLE event; #endif @@ -2450,7 +2450,9 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; -#ifdef HAVE_KQUEUE +#ifdef __linux__ + return entry; +#elif defined(HAVE_KQUEUE) if (!entry->kq) { int kq = kqueue(); @@ -2480,8 +2482,6 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchange( (LONG *)&entry->kq, kq, 0 )) close( kq ); } -#elif defined(__linux__) - return entry; #else if (!entry->event) { @@ -2509,7 +2509,14 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; -#ifdef HAVE_KQUEUE +#ifdef __linux__ + { + LONG *futex = &entry->futex; + if (!InterlockedExchange( futex, 1 )) + futex_wake( futex, 1 ); + return STATUS_SUCCESS; + } +#elif defined(HAVE_KQUEUE) { static const struct kevent signal_event = { @@ -2524,13 +2531,6 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) kevent( entry->kq, &signal_event, 1, NULL, 0, NULL ); return STATUS_SUCCESS; } -#elif defined(__linux__) - { - LONG *futex = &entry->futex; - if (!InterlockedExchange( futex, 1 )) - futex_wake( futex, 1 ); - return STATUS_SUCCESS; - } #else return NtSetEvent( entry->event, NULL ); #endif @@ -2560,59 +2560,6 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif -#ifdef HAVE_KQUEUE - -/*********************************************************************** - * NtWaitForAlertByThreadId (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) -{ - union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); - ULONGLONG end; - int ret; - struct timespec timespec; - struct kevent wait_event; - - TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); - - if (!entry) return STATUS_INVALID_CID; - - if (timeout) - { - if (timeout->QuadPart == TIMEOUT_INFINITE) - timeout = NULL; - else - end = get_absolute_timeout( timeout ); - } - - do - { - if (timeout) - { - LONGLONG timeleft = update_timeout( end ); - - timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; - timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; - if (timespec.tv_sec > 0x7FFFFFFF) timeout = NULL; - } - - ret = kevent( entry->kq, NULL, 0, &wait_event, 1, timeout ? &timespec : NULL ); - } while (ret == -1 && errno == EINTR); - - switch (ret) - { - case 1: - return STATUS_ALERTED; - case 0: - return STATUS_TIMEOUT; - default: - ERR( "kevent failed with error: %d (%s)\n", errno, strerror( errno ) ); - return STATUS_INVALID_HANDLE; - } -} - -#else - /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2656,6 +2603,46 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG } return STATUS_ALERTED; } +#elif defined(HAVE_KQUEUE) + { + ULONGLONG end; + int ret; + struct timespec timespec; + struct kevent wait_event; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + do + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + if (timespec.tv_sec > 0x7FFFFFFF) timeout = NULL; + } + + ret = kevent( entry->kq, NULL, 0, &wait_event, 1, timeout ? &timespec : NULL ); + } while (ret == -1 && errno == EINTR); + + switch (ret) + { + case 1: + return STATUS_ALERTED; + case 0: + return STATUS_TIMEOUT; + default: + ERR( "kevent failed with error: %d (%s)\n", errno, strerror( errno ) ); + return STATUS_INVALID_HANDLE; + } + } #else { NTSTATUS status = NtWaitForSingleObject( entry->event, FALSE, timeout ); @@ -2665,7 +2652,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif } -#endif /*********************************************************************** * NtCreateTransaction (NTDLL.@)

1 0

Marc-Aurel Zent : ntdll: Use USE_FUTEX to indicate futex support.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 9707a93948afce592c2aeb2f254467d9112c1c1e URL: https://gitlab.winehq.org/wine/wine/-/commit/9707a93948afce592c2aeb2f254467… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Tue Mar 5 13:17:55 2024 +0100 ntdll: Use USE_FUTEX to indicate futex support. --- dlls/ntdll/unix/sync.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1cad7dc8662..70203450615 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -103,9 +103,10 @@ static inline ULONGLONG monotonic_counter(void) return ticks_from_time_t( now.tv_sec ) + now.tv_usec * 10 - server_start_time; } - #ifdef __linux__ +#define USE_FUTEX + #include <linux/futex.h> static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) @@ -129,8 +130,7 @@ static inline int futex_wake( const LONG *addr, int val ) return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, val, NULL, 0, 0 ); } -#endif - +#endif /* __linux__ */ /* create a struct security_descriptor and contained information in one contiguous piece of memory */ unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, @@ -2409,7 +2409,7 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { -#ifdef __linux__ +#ifdef USE_FUTEX LONG futex; #elif defined(HAVE_KQUEUE) int kq; @@ -2450,7 +2450,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; -#ifdef __linux__ +#ifdef USE_FUTEX return entry; #elif defined(HAVE_KQUEUE) if (!entry->kq) @@ -2509,7 +2509,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; -#ifdef __linux__ +#ifdef USE_FUTEX { LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) @@ -2537,7 +2537,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) } -#if defined(__linux__) || defined(HAVE_KQUEUE) +#if defined(USE_FUTEX) || defined(HAVE_KQUEUE) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2571,7 +2571,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG if (!entry) return STATUS_INVALID_CID; -#ifdef __linux__ +#ifdef USE_FUTEX { LONG *futex = &entry->futex; ULONGLONG end;

1 0

Marc-Aurel Zent : ntdll: Simplify futex interface from futex_wake() to futex_wake_one().
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 410790a4f3f425adc52454f70ea56f4c8f040dab URL: https://gitlab.winehq.org/wine/wine/-/commit/410790a4f3f425adc52454f70ea56f… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Wed Mar 6 08:35:58 2024 +0100 ntdll: Simplify futex interface from futex_wake() to futex_wake_one(). --- dlls/ntdll/unix/sync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 70203450615..3a4eb21c3c4 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -125,9 +125,9 @@ static inline int futex_wait( const LONG *addr, int val, struct timespec *timeou return syscall( __NR_futex, addr, FUTEX_WAIT_PRIVATE, val, timeout, 0, 0 ); } -static inline int futex_wake( const LONG *addr, int val ) +static inline int futex_wake_one( const LONG *addr ) { - return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, val, NULL, 0, 0 ); + return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, 1, NULL, 0, 0 ); } #endif /* __linux__ */ @@ -2513,7 +2513,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) { LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) - futex_wake( futex, 1 ); + futex_wake_one( futex ); return STATUS_SUCCESS; } #elif defined(HAVE_KQUEUE)

1 0

Marc-Aurel Zent : ntdll: Implement futex_wait() and futex_wake_one() on macOS.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 2fb62cf9a5328328e7291d00bce0f449046d3a79 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fb62cf9a5328328e7291d00bce0f4… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Tue Mar 5 14:12:51 2024 +0100 ntdll: Implement futex_wait() and futex_wake_one() on macOS. --- README.md | 2 +- dlls/ntdll/unix/sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8a804b30dfc..28ab8fe7299 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To compile and run Wine, you must have one of the following: - FreeBSD 12.4 or later - Solaris x86 9 or later - NetBSD-current -- Mac OS X 10.8 or later +- Mac OS X 10.12 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 3a4eb21c3c4..21e66f01875 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -130,7 +130,71 @@ static inline int futex_wake_one( const LONG *addr ) return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, 1, NULL, 0, 0 ); } -#endif /* __linux__ */ +#elif defined(__APPLE__) + +#define USE_FUTEX + +#include <AvailabilityMacros.h> + +#ifdef MAC_OS_VERSION_14_4 +#include <os/os_sync_wait_on_address.h> +#endif + +#define UL_COMPARE_AND_WAIT 1 + +extern int __ulock_wait( uint32_t operation, void *addr, uint64_t value, uint32_t timeout ); + +extern int __ulock_wake( uint32_t operation, void *addr, uint64_t wake_value ); + +static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) +{ +#ifdef MAC_OS_VERSION_14_4 + if (__builtin_available( macOS 14.4, * )) + { + /* 18446744073 seconds could overflow a uint64_t in nanoseconds */ + if (timeout && timeout->tv_sec < 18446744073) + { + uint64_t ns_timeout = (timeout->tv_sec * 1000000000) + timeout->tv_nsec; + + if (!ns_timeout) + { + errno = ETIMEDOUT; + return -1; + } + return os_sync_wait_on_address_with_timeout( (void *)addr, (uint64_t)val, 4, OS_SYNC_WAIT_ON_ADDRESS_NONE, + OS_CLOCK_MACH_ABSOLUTE_TIME, ns_timeout ); + } + + return os_sync_wait_on_address( (void *)addr, (uint64_t)val, 4, OS_SYNC_WAIT_ON_ADDRESS_NONE ); + } +#endif + + /* 4294 seconds could overflow a uint32_t in microseconds */ + if (timeout && timeout->tv_sec < 4294) + { + uint32_t us_timeout = ((uint32_t)timeout->tv_sec * 1000000) + ((uint32_t)timeout->tv_nsec / 1000); + + if (!us_timeout) + { + errno = ETIMEDOUT; + return -1; + } + return __ulock_wait( UL_COMPARE_AND_WAIT, (void *)addr, (uint64_t)val, us_timeout ); + } + + return __ulock_wait( UL_COMPARE_AND_WAIT, (void *)addr, (uint64_t)val, 0 ); +} + +static inline int futex_wake_one( const LONG *addr ) +{ +#ifdef MAC_OS_VERSION_14_4 + if (__builtin_available( macOS 14.4, * )) + return os_sync_wake_by_address_any( (void *)addr, 4, OS_SYNC_WAKE_BY_ADDRESS_NONE ); +#endif + return __ulock_wake( UL_COMPARE_AND_WAIT, (void *)addr, 0 ); +} + +#endif /* __APPLE__ */ /* create a struct security_descriptor and contained information in one contiguous piece of memory */ unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,

1 0