Merge pull request #903 from MisterDA/windows-create-process-unicode-env

`CreateProcess` needs `CREATE_UNICODE_ENVIRONMENT`
ocsigen · Nov 23, 2021 · d5f8452 · d5f8452
2 parents 0ebeccb + a9d7cfe
commit d5f8452
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -43,7 +43,7 @@
 
   * Code quality improvement: remove an uneeded Obj.magic (#844, Benoit Montagu).
 
-  * On Windows, use the Unicode API in C stubs and functions introduced in OCaml 4.06 to handle Unicode strings. Raise the minimum requirement to OCaml 4.06 (on Windows only). (#843, Antonin Décimo)
+  * On Windows, use the Unicode API in C stubs and functions introduced in OCaml 4.06 to handle Unicode strings. Raise the minimum requirement to OCaml 4.06 (on Windows only). (#843, #903, Antonin Décimo)
 
 ===== 5.4.2 =====
 

diff --git a/src/unix/lwt_process_stubs.c b/src/unix/lwt_process_stubs.c
@@ -41,6 +41,7 @@ CAMLprim value lwt_process_create_process(value prog, value cmdline, value env,
 
   STARTUPINFO si;
   PROCESS_INFORMATION pi;
+  DWORD flags = CREATE_UNICODE_ENVIRONMENT;
   BOOL ret;
 
 #define string_option(opt) \
@@ -62,7 +63,7 @@ CAMLprim value lwt_process_create_process(value prog, value cmdline, value env,
   si.hStdOutput = get_handle(Field(fds, 1));
   si.hStdError = get_handle(Field(fds, 2));
 
-  ret = CreateProcess(progs, cmdlines, NULL, NULL, TRUE, 0,
+  ret = CreateProcess(progs, cmdlines, NULL, NULL, TRUE, flags,
                       envs, cwds, &si, &pi);
   caml_stat_free(progs);
   caml_stat_free(cmdlines);

diff --git a/src/unix/windows_c/windows_system_job.c b/src/unix/windows_c/windows_system_job.c
@@ -51,6 +51,7 @@ CAMLprim value lwt_unix_system_job(value cmdline)
     CAMLparam1(cmdline);
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
+    DWORD flags = CREATE_UNICODE_ENVIRONMENT;
     BOOL ret;
 
     char_os *cmdlines = caml_stat_strdup_to_os(String_val(cmdline));
@@ -59,7 +60,7 @@ CAMLprim value lwt_unix_system_job(value cmdline)
     ZeroMemory(&pi, sizeof(pi));
     si.cb = sizeof(si);
 
-    ret = CreateProcess(NULL, cmdlines, NULL, NULL, TRUE, 0,
+    ret = CreateProcess(NULL, cmdlines, NULL, NULL, TRUE, flags,
                         NULL, NULL, &si, &pi);
     caml_stat_free(cmdlines);
     if (!ret) {