shell32: Use full path to current directory for finding executables.

So that the path returned by SHELL_FindExecutable would be fully qualified, otherwise CreateProcess will do its own path resolution which is not what we want.

shell32: Use full path to current directory for finding executables.
9bd7fab4 · Yuxuan Shui · Alexandre Julliard · 20f8758e · 9bd7fab4
Commit 9bd7fab4 authored Mar 25, 2024 by Yuxuan Shui Committed by Alexandre Julliard Apr 30, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

shlexec.c dlls/shell32/shlexec.c +13 -1

No files found.
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1797,10 +1797,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )

    if (*sei_tmp.lpDirectory)
    {
+        LPWSTR buf;
        len = ExpandEnvironmentStringsW(sei_tmp.lpDirectory, NULL, 0);
        if (len > 0)
        {
-            LPWSTR buf;
            len++;
            buf = malloc(len * sizeof(WCHAR));
            ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buf, len);
@@ -1809,6 +1809,18 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
            wszDir = buf;
            sei_tmp.lpDirectory = wszDir;
        }
+
+        len = GetFullPathNameW(sei_tmp.lpDirectory, 0, NULL, NULL);
+        if (len > 0)
+        {
+            len++;
+            buf = malloc(len * sizeof(WCHAR));
+            GetFullPathNameW(sei_tmp.lpDirectory, len, buf, NULL);
+            if (wszDir != dirBuffer)
+                    free(wszDir);
+            wszDir = buf;
+            sei_tmp.lpDirectory = wszDir;
+        }
    }

    /* Else, try to execute the filename */