Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / w32process-win32.c

diff --git a/mono/metadata/w32process-win32.c b/mono/metadata/w32process-win32.c
index 048d62ded95e4a67947ad51a8a10173db0b174d0..24fb97ce4d499e116c6361dd080ee65cc5611fc0 100644 (file)
--- a/mono/metadata/w32process-win32.c
+++ b/mono/metadata/w32process-win32.c
@@ -1,5 +1,6 @@
-/*
- * process.c: System.Diagnostics.Process support
+/**
+ * \file
+ * System.Diagnostics.Process support
  *
  * Author:
  *     Dick Porter (dick@ximian.com)
@@ -25,13 +26,13 @@
 #include <mono/metadata/image.h>
 #include <mono/metadata/cil-coff.h>
 #include <mono/metadata/exception.h>
-#include <mono/metadata/threadpool-ms-io.h>
+#include <mono/metadata/threadpool-io.h>
 #include <mono/utils/strenc.h>
 #include <mono/utils/mono-proclib.h>
-#include <mono/io-layer/io-layer.h>
 /* FIXME: fix this code to not depend so much on the internals */
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/w32handle.h>
+#include <mono/utils/w32api.h>
 
 #if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 #include <shellapi.h>
@@ -47,6 +48,11 @@ mono_w32process_cleanup (void)
 {
 }
 
+void
+mono_w32process_signal_finished (void)
+{
+}
+
 #if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 HANDLE
 ves_icall_System_Diagnostics_Process_GetProcess_internal (guint32 pid)
@@ -143,20 +149,20 @@ mono_process_create_process (MonoW32ProcessInfo *mono_process_info, MonoString *
                                                  mono_process_info->domain ? mono_string_chars (mono_process_info->domain) : NULL,
                                                  (const gunichar2 *)mono_process_info->password,
                                                  logon_flags,
-                                                 shell_path,
+                                                 NULL,
                                                  cmd ? mono_string_chars (cmd) : NULL,
                                                  creation_flags,
-                                                 (gchar*) env_vars, dir, start_info, process_info);
+                                                 env_vars, dir, start_info, process_info);
 
        } else {
 
-               result = CreateProcess (shell_path,
+               result = CreateProcessW (NULL,
                                        cmd ? mono_string_chars (cmd): NULL,
                                        NULL,
                                        NULL,
                                        TRUE,
                                        creation_flags,
-                                       (gchar*) env_vars,
+                                       env_vars,
                                        dir,
                                        start_info,
                                        process_info);
@@ -297,20 +303,20 @@ ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoW32ProcessStart
 
                        len += mono_string_length (var) * sizeof (gunichar2);
 
-                       /* it's null-separated and null-terminated */
+                       /* null-separated */
                        len += sizeof (gunichar2);
                }
+               /* null-terminated */
+               len += sizeof (gunichar2);
 
-               env_vars = ptr = g_new (gunichar2, len);
+               env_vars = ptr = g_new0 (gunichar2, len);
 
                for (i = 0; i < mono_array_length (process_info->env_variables); i++) {
                        var = mono_array_get (process_info->env_variables, MonoString*, i);
 
                        memcpy (ptr, mono_string_chars (var), mono_string_length (var) * sizeof (gunichar2));
-                       ptr += mono_string_length (key);
-
-                       memset (ptr, 0, sizeof (gunichar2));
-                       ptr += 1;
+                       ptr += mono_string_length (var);
+                       ptr += 1; // Skip over the null-separator
                }
        }
        
@@ -322,7 +328,7 @@ ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoW32ProcessStart
        else
                dir = mono_string_chars (proc_start_info->working_directory);
 
-       ret = mono_process_create_process (process_info, NULL, cmd, creation_flags, env_vars, dir, &startinfo, &procinfo);
+       ret = mono_process_create_process (process_info, cmd, creation_flags, env_vars, dir, &startinfo, &procinfo);
 
        g_free (env_vars);