[PATCH 1/1] ucrtbase: Always use CP_ACP when converting environment block.

[Piotr Caban]

From: Piotr Caban

---
 dlls/msvcrt/process.c      |  5 +++--
 dlls/ucrtbase/tests/file.c | 20 +++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
index c6e172ba42c..f50fd7a213f 100644
--- a/dlls/msvcrt/process.c
+++ b/dlls/msvcrt/process.c
@@ -233,6 +233,7 @@ static wchar_t* msvcrt_argvtos(const wchar_t* const* arg, wchar_t delim)
  */
 static wchar_t *msvcrt_argvtos_aw(const char * const *arg, BOOL env)
 {
+  UINT cp = env ? CP_ACP : get_aw_cp();
   const char * const *a;
   unsigned int len;
   wchar_t *p, *ret;
@@ -248,7 +249,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, BOOL env)
   len = 0;
   while (*a)
   {
-    len += MultiByteToWideChar(get_aw_cp(), 0, *a, -1, NULL, 0);
+    len += MultiByteToWideChar(cp, 0, *a, -1, NULL, 0);
     a++;
   }

@@ -261,7 +262,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, BOOL env)
   p = ret;
   while (*a)
   {
-    p += MultiByteToWideChar(get_aw_cp(), 0, *a, strlen(*a), p, len - (p - ret));
+    p += MultiByteToWideChar(cp, 0, *a, strlen(*a), p, len - (p - ret));
     *p++ = env ? 0 : ' ';
     a++;
   }
diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c
index de7415bb2fc..45043be114a 100644
--- a/dlls/ucrtbase/tests/file.c
+++ b/dlls/ucrtbase/tests/file.c
@@ -225,7 +225,7 @@ static void test_utf8(const char *argv0)
     const WCHAR fileW[] = L"file\x0119\x015b\x0107.a";
     const WCHAR dirW[] = L"dir\x0119\x015b\x0107";

-    char file2[32], buf[256], *p, *q;
+    char file2[32], buf[256], *p, *q, *env[2];
     struct _finddata64i32_t fdata64i32;
     struct _finddata32_t fdata32;
     struct _finddata64_t fdata64;
@@ -421,7 +421,11 @@ static void test_utf8(const char *argv0)
         ok(!ret, "_putenv returned %d, errno %d\n", ret, errno);
     }

-    hproc = _spawnl(_P_NOWAIT, argv0, argv0, "file", "utf8", file, NULL);
+    strcpy(buf, "__wine_env_test=");
+    strcat(buf, file);
+    env[0] = buf;
+    env[1] = NULL;
+    hproc = _spawnle(_P_NOWAIT, argv0, argv0, "file", "utf8", file, NULL, env);
     ok(hproc != -1, "_spawnl returned %Id, errno %d\n", hproc, errno);
     wait_child_process((HANDLE)hproc);
     CloseHandle((HANDLE)hproc);
@@ -431,11 +435,21 @@ static void test_utf8(const char *argv0)

static void test_utf8_argument(void)
 {
+    static const WCHAR nameW[] = L"file\x0119\x015b\x0107.a";
     const WCHAR *cmdline = GetCommandLineW(), *p;
+    WCHAR buf[256];
+    DWORD ret;

p = wcsrchr(cmdline, ' ');
     ok(!!p, "cmdline = %s\n", debugstr_w(cmdline));
-    ok(!wcscmp(p + 1, L"file\x0119\x015b\x0107.a"), "cmdline = %s\n", debugstr_w(cmdline));
+    ok(!wcscmp(p + 1, nameW), "cmdline = %s\n", debugstr_w(cmdline));
+
+    ret = GetEnvironmentVariableW(L"__wine_env_test", buf, sizeof(buf));
+    ok(ret, "GetEnvironmentVariableW returned error %lu\n", GetLastError());
+    if (GetACP() == CP_UTF8)
+        ok(!wcscmp(buf, nameW), "__wine_env_test = %s\n", debugstr_w(buf));
+    else
+        ok(wcscmp(buf, nameW), "environment was converted\n");
 }

START_TEST(file)