ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Move Unix environment initialization to ntdll. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-10-22 10:04:51 +02:00
parent cac9599207
commit a511057f7e
2 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlls/kernel32/process.c
View File

@ -66,13 +66,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(process);
WINE_DECLARE_DEBUG_CHANNEL(relay);
#ifdef __APPLE__
extern char **__wine_get_main_environment(void);
#else
extern char **__wine_main_environ;
static char **__wine_get_main_environment(void) { return __wine_main_environ; }
#endif
typedef struct
{
LPSTR lpEnvAddress;
@ -455,52 +448,6 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE
}
/***********************************************************************
* build_initial_environment
*
* Build the Win32 environment from the Unix environment
*/
static BOOL build_initial_environment(void)
{
SIZE_T size = 1;
char **e;
WCHAR *p, *endptr;
void *ptr;
char **env = __wine_get_main_environment();
/* Compute the total size of the Unix environment */
for (e = env; *e; e++)
{
if (is_special_env_var( *e )) continue;
size += MultiByteToWideChar( CP_UNIXCP, 0, *e, -1, NULL, 0 );
}
size *= sizeof(WCHAR);
if (!(ptr = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return FALSE;
NtCurrentTeb()->Peb->ProcessParameters->Environment = p = ptr;
endptr = p + size / sizeof(WCHAR);
/* And fill it with the Unix environment */
for (e = env; *e; e++)
{
char *str = *e;
/* skip Unix special variables and use the Wine variants instead */
if (!strncmp( str, "WINE", 4 ))
{
if (is_special_env_var( str + 4 )) str += 4;
else if (!strncmp( str, "WINEPRELOADRESERVE=", 19 )) continue; /* skip it */
}
else if (is_special_env_var( str )) continue; /* skip it */
MultiByteToWideChar( CP_UNIXCP, 0, str, -1, p, endptr - p );
p += strlenW(p) + 1;
}
*p = 0;
return TRUE;
}
/***********************************************************************
* set_registry_variables
*
@ -1255,11 +1202,8 @@ void * CDECL __wine_kernel_init(void)
LOCALE_Init();
if (!params->Environment)
if (!peb->ProcessParameters->WindowTitle.Buffer)
{
/* Copy the parent environment */
if (!build_initial_environment()) exit(1);
/* convert old configuration to new format */
convert_old_config();

72
dlls/ntdll/env.c
View File

@ -35,6 +35,7 @@
#define WIN32_NO_STATUS
#include "windef.h"
#include "winternl.h"
#include "wine/library.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "ntdll_misc.h"
@ -55,6 +56,76 @@ static inline SIZE_T get_env_length( const WCHAR *env )
return end + 1 - env;
}
#ifdef __APPLE__
extern char **__wine_get_main_environment(void);
#else
extern char **__wine_main_environ;
static char **__wine_get_main_environment(void) { return __wine_main_environ; }
#endif
/***********************************************************************
* is_special_env_var
*
* Check if an environment variable needs to be handled specially when
* passed through the Unix environment (i.e. prefixed with "WINE").
*/
static inline BOOL is_special_env_var( const char *var )
{
return (!strncmp( var, "PATH=", sizeof("PATH=")-1 ) ||
!strncmp( var, "PWD=", sizeof("PWD=")-1 ) ||
!strncmp( var, "HOME=", sizeof("HOME=")-1 ) ||
!strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) ||
!strncmp( var, "TMP=", sizeof("TMP=")-1 ) ||
!strncmp( var, "QT_", sizeof("QT_")-1 ) ||
!strncmp( var, "VK_", sizeof("VK_")-1 ));
}
/***********************************************************************
* build_initial_environment
*
* Build the Win32 environment from the Unix environment
*/
static WCHAR *build_initial_environment( char **env )
{
SIZE_T size = 1;
char **e;
WCHAR *p, *ptr;
/* compute the total size of the Unix environment */
for (e = env; *e; e++)
{
if (is_special_env_var( *e )) continue;
size += ntdll_umbstowcs( 0, *e, strlen(*e) + 1, NULL, 0 );
}
if (!(ptr = RtlAllocateHeap( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return NULL;
p = ptr;
/* and fill it with the Unix environment */
for (e = env; *e; e++)
{
char *str = *e;
/* skip Unix special variables and use the Wine variants instead */
if (!strncmp( str, "WINE", 4 ))
{
if (is_special_env_var( str + 4 )) str += 4;
else if (!strncmp( str, "WINEPRELOADRESERVE=", 19 )) continue; /* skip it */
}
else if (is_special_env_var( str )) continue; /* skip it */
ntdll_umbstowcs( 0, str, strlen(str) + 1, p, size - (p - ptr) );
p += strlenW(p) + 1;
}
*p = 0;
return ptr;
}
/***********************************************************************
* get_current_directory
*
@ -644,6 +715,7 @@ void init_user_process_params( SIZE_T data_size )
return;
NtCurrentTeb()->Peb->ProcessParameters = params;
params->Environment = build_initial_environment( __wine_get_main_environment() );
get_current_directory( &params->CurrentDirectory.DosPath );
if (isatty(0) || isatty(1) || isatty(2))