[PATCH v2 09/11] msvcrt: Prepare _execle to handle utf-8 encoded arguments.

[Piotr Caban]

From: Piotr Caban

---
 dlls/msvcrt/msvcrt.h  |  9 +++++++--
 dlls/msvcrt/process.c | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 39349345de0..8072d5117df 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -412,14 +412,19 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,

#define INHERIT_THREAD_PRIORITY 0xF000

+static inline UINT get_aw_cp(void)
+{
+    return CP_ACP;
+}
+
 static inline int convert_acp_utf8_to_wcs(const char *str, wchar_t *wstr, int len)
 {
-    return MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, str, -1, wstr, len);
+    return MultiByteToWideChar(get_aw_cp(), MB_PRECOMPOSED, str, -1, wstr, len);
 }

static inline int convert_wcs_to_acp_utf8(const wchar_t *wstr, char *str, int len)
 {
-    return WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, len, NULL, NULL);
+    return WideCharToMultiByte(get_aw_cp(), 0, wstr, -1, str, len, NULL, NULL);
 }

static inline wchar_t* wstrdupa_utf8(const char *str)
diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
index 5b16178b335..ed62ed871fd 100644
--- a/dlls/msvcrt/process.c
+++ b/dlls/msvcrt/process.c
@@ -228,10 +228,10 @@ static wchar_t* msvcrt_argvtos(const wchar_t* const* arg, wchar_t delim)
   return ret;
 }

-/* INTERNAL: Convert ansi argv list to a single 'delim'-separated wide string, with an
- * extra '\0' to terminate it.
+/* INTERNAL: Convert ansi argv list to a single wide string, use ' ' or '\0'
+ * as separator depending on env argument.
  */
-static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim)
+static wchar_t *msvcrt_argvtos_aw(const char * const *arg, BOOL env)
 {
   const char * const *a;
   unsigned int len;
@@ -248,7 +248,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim)
   len = 0;
   while (*a)
   {
-    len += MultiByteToWideChar(CP_ACP, 0, *a, -1, NULL, 0);
+    len += MultiByteToWideChar(get_aw_cp(), 0, *a, -1, NULL, 0);
     a++;
   }

@@ -261,11 +261,11 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim)
   p = ret;
   while (*a)
   {
-    p += MultiByteToWideChar(CP_ACP, 0, *a, strlen(*a), p, len - (p - ret));
-    *p++ = delim;
+    p += MultiByteToWideChar(get_aw_cp(), 0, *a, strlen(*a), p, len - (p - ret));
+    *p++ = env ? 0 : ' ';
     a++;
   }
-  if (delim && p > ret) p[-1] = 0;
+  if (!env && p > ret) p[-1] = 0;
   else *p = 0;
   return ret;
 }
@@ -469,7 +469,7 @@ intptr_t WINAPIV _execle(const char* name, const char* arg0, ...)
   const char * const *envp;
   intptr_t ret;

-  if (!(nameW = msvcrt_wstrdupa(name))) return -1;
+  if (!(nameW = wstrdupa_utf8(name))) return -1;

va_start(ap, arg0);
   args = msvcrt_valisttos_aw(arg0, ap, ' ');
@@ -478,7 +478,7 @@ intptr_t WINAPIV _execle(const char* name, const char* arg0, ...)
   va_start(ap, arg0);
   while (va_arg( ap, char * ) != NULL) /*nothing*/;
   envp = va_arg( ap, const char * const * );
-  if (envp) envs = msvcrt_argvtos_aw(envp, 0);
+  if (envp) envs = msvcrt_argvtos_aw(envp, TRUE);
   va_end(ap);

ret = msvcrt_spawn(_P_OVERLAY, nameW, args, envs, 0);
@@ -583,7 +583,7 @@ intptr_t WINAPIV _execlpe(const char* name, const char* arg0, ...)
   va_start(ap, arg0);
   while (va_arg( ap, char * ) != NULL) /*nothing*/;
   envp = va_arg( ap, const char * const * );
-  if (envp) envs = msvcrt_argvtos_aw(envp, 0);
+  if (envp) envs = msvcrt_argvtos_aw(envp, TRUE);
   va_end(ap);

ret = msvcrt_spawn(_P_OVERLAY, nameW, args, envs, 1);
@@ -772,7 +772,7 @@ intptr_t WINAPIV _spawnle(int flags, const char* name, const char* arg0, ...)
   va_start(ap, arg0);
   while (va_arg( ap, char * ) != NULL) /*nothing*/;
   envp = va_arg( ap, const char * const * );
-  if (envp) envs = msvcrt_argvtos_aw(envp, 0);
+  if (envp) envs = msvcrt_argvtos_aw(envp, TRUE);
   va_end(ap);

ret = msvcrt_spawn(flags, nameW, args, envs, 0);
@@ -877,7 +877,7 @@ intptr_t WINAPIV _spawnlpe(int flags, const char* name, const char* arg0, ...)
   va_start(ap, arg0);
   while (va_arg( ap, char * ) != NULL) /*nothing*/;
   envp = va_arg( ap, const char * const * );
-  if (envp) envs = msvcrt_argvtos_aw(envp, 0);
+  if (envp) envs = msvcrt_argvtos_aw(envp, TRUE);
   va_end(ap);

ret = msvcrt_spawn(flags, nameW, args, envs, 1);
@@ -902,8 +902,8 @@ intptr_t CDECL _spawnve(int flags, const char* name, const char* const* argv,

if (!(nameW = msvcrt_wstrdupa(name))) return -1;

-  args = msvcrt_argvtos_aw(argv, ' ');
-  envs = msvcrt_argvtos_aw(envv, 0);
+  args = msvcrt_argvtos_aw(argv, FALSE);
+  envs = msvcrt_argvtos_aw(envv, TRUE);

ret = msvcrt_spawn(flags, nameW, args, envs, 0);

@@ -969,8 +969,8 @@ intptr_t CDECL _spawnvpe(int flags, const char* name, const char* const* argv,

if (!(nameW = msvcrt_wstrdupa(name))) return -1;

-  args = msvcrt_argvtos_aw(argv, ' ');
-  envs = msvcrt_argvtos_aw(envv, 0);
+  args = msvcrt_argvtos_aw(argv, FALSE);
+  envs = msvcrt_argvtos_aw(envv, TRUE);

ret = msvcrt_spawn(flags, nameW, args, envs, 1);