From a5903828501ce21c81d49d49f80704b714a8bffc Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 May 2024 14:00:04 -0400 Subject: libuv: win/spawn: disable extra-file-descriptor support not needed by CMake Upstream libuv supports passing file descriptors >= 3 to child processes via `STARTUPINFOW` members reserved by the MSVC C run-time. However, some programs use `GetStartupInfoW` to initialize a `STARTUPINFOW` structure to pass to `CreateProcessW` without clearing the reserved members. If we launch such programs with non-zero values in the reserved members, the MSVC C run-time in *their* children may not correctly associate the stdin/stdout/stderr streams' file descriptors with the corresponding `HANDLE`s. Patch our copy of libuv to avoid using the reserved members. This restores `execute_process` support for the above-described programs as we had prior to commit 5420639a8d (cmExecuteProcessCommand: Replace cmsysProcess with cmUVProcessChain, 2023-06-01, v3.28.0-rc1~138^2~8). It also enables support for such programs when launched by `ctest`. Fixes: #25996 Fixes: #25889 --- Utilities/cmlibuv/src/win/process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 11cf5b2..5cf9fb8 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -1083,8 +1083,15 @@ int uv_spawn(uv_loop_t* loop, startup.lpTitle = NULL; startup.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; +#if 1 + /* cmake does not need libuv's support for passing file descriptors >= 3 + to the MSVC C run-time in the child. Avoid using reserved members. */ + startup.cbReserved2 = 0; + startup.lpReserved2 = NULL; +#else startup.cbReserved2 = uv__stdio_size(process->child_stdio_buffer); startup.lpReserved2 = (BYTE*) process->child_stdio_buffer; +#endif startup.hStdInput = uv__stdio_handle(process->child_stdio_buffer, 0); startup.hStdOutput = uv__stdio_handle(process->child_stdio_buffer, 1); -- cgit v0.12 From fa8c04b421d1d0af93d58c8e04ee0dce13ecb473 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 May 2024 14:51:02 -0400 Subject: Tests/RunCMake/execute_process: Check STARTUPINFOW reserved members Verify that `execute_process` launches processes on Windows such that `GetStartupInfoW` in the child does not populate `STARTUPINFOW` members reserved for the MSVC C run-time. Issue: #25996 --- Tests/RunCMake/CMakeLists.txt | 4 ++++ Tests/RunCMake/execute_process/RunCMakeTest.cmake | 4 ++++ Tests/RunCMake/execute_process/StartupInfo.cmake | 1 + Tests/RunCMake/testStartupInfo.c | 25 +++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 Tests/RunCMake/execute_process/StartupInfo.cmake create mode 100644 Tests/RunCMake/testStartupInfo.c diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index f10e72d..a9fe571 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -513,6 +513,10 @@ set(execute_process_ARGS if(NOT CMake_TEST_EXTERNAL_CMAKE) list(APPEND execute_process_ARGS -DTEST_ENCODING_EXE=$) endif() +if(WIN32) + add_executable(testStartupInfo testStartupInfo.c) + list(APPEND execute_process_ARGS -DTEST_STARTUPINFO_EXE=$) +endif() add_RunCMake_test(execute_process) add_RunCMake_test(export) if(CMake_TEST_MSYSTEM_PREFIX) diff --git a/Tests/RunCMake/execute_process/RunCMakeTest.cmake b/Tests/RunCMake/execute_process/RunCMakeTest.cmake index a3a3a9a..cd5e41b 100644 --- a/Tests/RunCMake/execute_process/RunCMakeTest.cmake +++ b/Tests/RunCMake/execute_process/RunCMakeTest.cmake @@ -53,3 +53,7 @@ if(WIN32 OR CYGWIN) set(RunCMake_TEST_NO_CLEAN 1) run_cmake_command(WindowsNoExtension-build ${CMAKE_COMMAND} --build . --config Debug --target RunScript) endif() + +if(TEST_STARTUPINFO_EXE) + run_cmake_script(StartupInfo -DTEST_STARTUPINFO_EXE=${TEST_STARTUPINFO_EXE}) +endif() diff --git a/Tests/RunCMake/execute_process/StartupInfo.cmake b/Tests/RunCMake/execute_process/StartupInfo.cmake new file mode 100644 index 0000000..54b9ad4 --- /dev/null +++ b/Tests/RunCMake/execute_process/StartupInfo.cmake @@ -0,0 +1 @@ +execute_process(COMMAND "${TEST_STARTUPINFO_EXE}" COMMAND_ERROR_IS_FATAL ANY) diff --git a/Tests/RunCMake/testStartupInfo.c b/Tests/RunCMake/testStartupInfo.c new file mode 100644 index 0000000..d626fb9 --- /dev/null +++ b/Tests/RunCMake/testStartupInfo.c @@ -0,0 +1,25 @@ +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS +#endif + +#if defined(_MSC_VER) && _MSC_VER >= 1928 +# pragma warning(disable : 5105) /* macro expansion warning in windows.h */ +#endif + +#include + +#include +#include + +int main(void) +{ + STARTUPINFOW si; + memset(&si, 0, sizeof(si)); + GetStartupInfoW(&si); + if (si.cbReserved2 != 0 || si.lpReserved2 != NULL) { + fprintf(stderr, "si.cbReserved2: %u\n", si.cbReserved2); + fprintf(stderr, "si.lpReserved2: %p\n", si.lpReserved2); + return 1; + } + return 0; +} -- cgit v0.12