[PATCH 3/3] kernel32: Prioritize the working directory in CreateProcess.

[Erich E. Hoover]

From: "Erich E. Hoover" <erich.e.hoover at gmail.com>

MSDN specifically says that NeedCurrentDirectoryForExePath is used to
determine whether to prioritize the current directory in the search.

Signed-off-by: Erich E. Hoover <erich.e.hoover at gmail.com>
---
 dlls/kernel32/process.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 4e6ba1118e..e335fb52bb 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -262,9 +262,17 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info
 static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen,
                            HANDLE *handle, struct binary_info *binary_info )
 {
+    WCHAR cur_dir[MAX_PATH];
+
     TRACE("looking for %s\n", debugstr_w(name) );
 
-    if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) &&
+    /* The working directory takes precedence over other locations for CreateProcess unless the
+     * 'NoDefaultCurrentDirectoryInExePath' environment variable is set (and the executable name
+     * does not contain a backslash). */
+    if ((NeedCurrentDirectoryForExePathW( name ) && GetCurrentDirectoryW( MAX_PATH, cur_dir) &&
+         !SearchPathW( cur_dir, name, exeW, buflen, buffer, NULL )) &&
+        /* not found in the working directory, try the system search path */
+        !SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) &&
         /* no builtin found, try native without extension in case it is a Unix app */
         !SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE;
 
-- 
2.14.1