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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9bd7fab471eb60f07f59947af0fef3254644a8ae
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9bd7fab471eb60f07f59947af0fef32...

Author: Yuxuan Shui <yshui(a)codeweavers.com>
Date:   Mon Mar 25 13:35:08 2024 +0000

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.

---

 dlls/shell32/shlexec.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 804aa38a904..9704f9d8f06 100644
--- 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 */