Set current directory when launching Native Messaging processes.

base/process/launch_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/process/launch.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <shellapi.h>
 #include <windows.h>
@@ skipping 272 matching lines @@
     // releases that do not support nested jobs.
     if (win::GetVersion() < win::VERSION_WIN8)
       flags |= CREATE_BREAKAWAY_FROM_JOB;
   }
 
   if (options.force_breakaway_from_job_)
     flags |= CREATE_BREAKAWAY_FROM_JOB;
 
   PROCESS_INFORMATION temp_process_info = {};
 
+  LPCTSTR current_directory = options.current_directory.empty()
+                                  ? NULL

[Lei Zhang, 2016/03/29 00:57:54]

nullptr in new code?

[Sergey Ulanov, 2016/04/04 18:01:27]

Done.

+                                  : options.current_directory.value().c_str();
+
   string16 writable_cmdline(cmdline);
   if (options.as_user) {
     flags |= CREATE_UNICODE_ENVIRONMENT;
     void* enviroment_block = NULL;
 
     if (!CreateEnvironmentBlock(&enviroment_block, options.as_user, FALSE)) {
       DPLOG(ERROR);
       return Process();
     }
 
-    BOOL launched =
-        CreateProcessAsUser(options.as_user, NULL,
-                            &writable_cmdline[0],
-                            NULL, NULL, inherit_handles, flags,
-                            enviroment_block, NULL, startup_info,
-                            &temp_process_info);
+    BOOL launched = CreateProcessAsUser(
+        options.as_user, NULL, &writable_cmdline[0], NULL, NULL,
+        inherit_handles, flags, enviroment_block, current_directory,
+        startup_info, &temp_process_info);
     DestroyEnvironmentBlock(enviroment_block);
     if (!launched) {
       DPLOG(ERROR) << "Command line:" << std::endl << UTF16ToUTF8(cmdline)
                    << std::endl;
       return Process();
     }
   } else {
-    if (!CreateProcess(NULL,
-                       &writable_cmdline[0], NULL, NULL,
-                       inherit_handles, flags, NULL, NULL,
-                       startup_info, &temp_process_info)) {
+    if (!CreateProcess(NULL, &writable_cmdline[0], NULL, NULL, inherit_handles,
+                       flags, NULL, current_directory, startup_info,
+                       &temp_process_info)) {
       DPLOG(ERROR) << "Command line:" << std::endl << UTF16ToUTF8(cmdline)
                    << std::endl;
       return Process();
     }
   }
   base::win::ScopedProcessInformation process_info(temp_process_info);
 
   if (options.job_handle) {
     if (0 == AssignProcessToJobObject(options.job_handle,
                                       process_info.process_handle())) {
@@ skipping 59 matching lines @@
 
 bool GetAppOutput(const StringPiece16& cl, std::string* output) {
   return GetAppOutputInternal(cl, false, output);
 }
 
 void RaiseProcessToHighPriority() {
   SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
 }
 
 }  // namespace base