[PATCH v4 7/7] msvcrt: Fix ucrtbase environment initialization.

[Eric Pouech]

From: Eric Pouech

Signed-off-by: Eric Pouech 
---
 dlls/msvcrt/data.c            | 34 +++++++++++++++++++---------------
 dlls/ucrtbase/tests/environ.c |  1 -
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index bec1e61e411..6e764e52eae 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -592,14 +592,6 @@ void CDECL __set_app_type(int app_type)

#if _MSVCR_VER>=140

-/*********************************************************************
- *		_get_initial_narrow_environment (UCRTBASE.@)
- */
-char** CDECL _get_initial_narrow_environment(void)
-{
-  return MSVCRT___initenv;
-}
-
 /*********************************************************************
  *		_configure_narrow_argv (UCRTBASE.@)
  */
@@ -614,16 +606,18 @@ int CDECL _configure_narrow_argv(int mode)
  */
 int CDECL _initialize_narrow_environment(void)
 {
-  TRACE("\n");
-  return 0;
+    TRACE("\n");
+    return env_init(FALSE, FALSE);
 }

/*********************************************************************
- *		_get_initial_wide_environment (UCRTBASE.@)
+ *		_get_initial_narrow_environment (UCRTBASE.@)
  */
-wchar_t** CDECL _get_initial_wide_environment(void)
+char** CDECL _get_initial_narrow_environment(void)
 {
-  return MSVCRT___winitenv;
+    TRACE("\n");
+    _initialize_narrow_environment();
+    return MSVCRT___initenv;
 }

/*********************************************************************
@@ -640,8 +634,18 @@ int CDECL _configure_wide_argv(int mode)
  */
 int CDECL _initialize_wide_environment(void)
 {
-  WARN("stub\n");
-  return 0;
+    TRACE("\n");
+    return env_init(TRUE, FALSE);
+}
+
+/*********************************************************************
+ *		_get_initial_wide_environment (UCRTBASE.@)
+ */
+wchar_t** CDECL _get_initial_wide_environment(void)
+{
+    TRACE("\n");
+    _initialize_wide_environment();
+    return MSVCRT___winitenv;
 }

/*********************************************************************
diff --git a/dlls/ucrtbase/tests/environ.c b/dlls/ucrtbase/tests/environ.c
index dc31c640239..a42f64466e9 100644
--- a/dlls/ucrtbase/tests/environ.c
+++ b/dlls/ucrtbase/tests/environ.c
@@ -136,7 +136,6 @@ static void test_initial_environ( void )

ok( p__p__wenviron() != NULL, "Unexpected NULL _wenviron[]\n" );
     ok( *p__p__wenviron() == NULL, "Unexpected non empty _wenviron[]\n" );
-    todo_wine
     ok( p_get_initial_wide_environment() != NULL, "Unexpected empty wide initial environment\n" );
     ok( p_get_initial_wide_environment() == *p__p__wenviron(), "Expecting _wenviron[] to match initial wide environment\n" );
 }