From: YeshunYe <yeyeshun@uniontech.com> If 'name' does not have a suffix, a suffix will be appended in find_exe_file. If 'name' contains spaces, it will result in an incorrect filename being concatenated. Signed-off-by: YeshunYe <yeyeshun@uniontech.com> --- dlls/kernelbase/process.c | 10 ++++++++-- dlls/kernelbase/tests/process.c | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 3656e40280d..d3a5b91074f 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -87,10 +87,16 @@ static WCHAR *get_file_name( WCHAR *cmdline, WCHAR *buffer, DWORD buflen ) if (cmdline[0] == '"' && (p = wcschr( cmdline + 1, '"' ))) { - int len = p - cmdline - 1; + int len; + /* trim spaces in quotes */ + const WCHAR* start = cmdline + 1; + const WCHAR* end = p - 1; + while (*start == ' ') start++; + while (*end == ' ') end--; + len = end - start + 1; /* extract the quoted portion as file name */ if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return NULL; - memcpy( name, cmdline + 1, len * sizeof(WCHAR) ); + memcpy( name, start, len * sizeof(WCHAR) ); name[len] = 0; if (!find_exe_file( name, buffer, buflen )) goto done; diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 373e8a587e4..2cf1ac407ca 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -641,7 +641,6 @@ static void test_CreateProcessInternalW(void) ret = CreateProcessInternalW(NULL, NULL, (LPWSTR)cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW | DETACHED_PROCESS, NULL, NULL, &si, &pi, NULL); - todo_wine ok( ret, "CreateProcessInternalW failed, error %lu.\n", GetLastError() ); if (pi.hProcess) wait_child_process(&pi); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9882