mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 18:57:19 +00:00
msvcrt: Fix ucrtbase environment initialization.
Signed-off-by: Eric Pouech <epouech@codeweavers.com>
This commit is contained in:
parent
bdb624fffb
commit
58155d3eb9
|
@ -592,14 +592,6 @@ void CDECL __set_app_type(int app_type)
|
||||||
|
|
||||||
#if _MSVCR_VER>=140
|
#if _MSVCR_VER>=140
|
||||||
|
|
||||||
/*********************************************************************
|
|
||||||
* _get_initial_narrow_environment (UCRTBASE.@)
|
|
||||||
*/
|
|
||||||
char** CDECL _get_initial_narrow_environment(void)
|
|
||||||
{
|
|
||||||
return MSVCRT___initenv;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* _configure_narrow_argv (UCRTBASE.@)
|
* _configure_narrow_argv (UCRTBASE.@)
|
||||||
*/
|
*/
|
||||||
|
@ -614,16 +606,18 @@ int CDECL _configure_narrow_argv(int mode)
|
||||||
*/
|
*/
|
||||||
int CDECL _initialize_narrow_environment(void)
|
int CDECL _initialize_narrow_environment(void)
|
||||||
{
|
{
|
||||||
TRACE("\n");
|
TRACE("\n");
|
||||||
return 0;
|
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)
|
int CDECL _initialize_wide_environment(void)
|
||||||
{
|
{
|
||||||
WARN("stub\n");
|
TRACE("\n");
|
||||||
return 0;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
|
|
|
@ -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 NULL _wenviron[]\n" );
|
||||||
ok( *p__p__wenviron() == NULL, "Unexpected non empty _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() != NULL, "Unexpected empty wide initial environment\n" );
|
||||||
ok( p_get_initial_wide_environment() == *p__p__wenviron(), "Expecting _wenviron[] to match initial wide environment\n" );
|
ok( p_get_initial_wide_environment() == *p__p__wenviron(), "Expecting _wenviron[] to match initial wide environment\n" );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue