October 2019 - Wine-commits

Alexandre Julliard : ntdll: Always add path separator when looking for a relative path name.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: e4595a0ce8fd26d10d2bd47a310d1c1cf7bd953f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4595a0ce8fd26d10d2bd47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 09:57:00 2019 +0200 ntdll: Always add path separator when looking for a relative path name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47979 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bdf2646f08..7554934701 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2705,19 +2705,20 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer /* try a shortcut first */ - ret = ntdll_wcstoumbs( 0, name, name_len, unix_name + pos, unix_len - pos - 1, - NULL, &used_default ); - while (name_len && IS_SEPARATOR(*name)) { name++; name_len--; } + unix_name[pos] = '/'; + ret = ntdll_wcstoumbs( 0, name, name_len, unix_name + pos + 1, unix_len - pos - 2, + NULL, &used_default ); + if (ret >= 0 && !used_default) /* if we used the default char the name didn't convert properly */ { char *p; - unix_name[pos + ret] = 0; + unix_name[pos + 1 + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; if (!name_len || !redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) {

1 0

Alexandre Julliard : kernel32: Move current directory initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 305b5a44c57015ff6b981f83c985c85b223058e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=305b5a44c57015ff6b981f83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 09:58:32 2019 +0200 kernel32: Move current directory initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 73 --------------------------------------- dlls/ntdll/env.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 89 insertions(+), 76 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5cb470e0c7..a60aad6721 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1085,78 +1085,6 @@ static BOOL build_command_line( WCHAR **argv ) } -/*********************************************************************** - * init_current_directory - * - * Initialize the current directory from the Unix cwd or the parent info. - */ -static void init_current_directory( CURDIR *cur_dir ) -{ - UNICODE_STRING dir_str; - const char *pwd; - char *cwd; - int size; - - /* if we received a cur dir from the parent, try this first */ - - if (cur_dir->DosPath.Length) - { - if (RtlSetCurrentDirectory_U( &cur_dir->DosPath ) == STATUS_SUCCESS) goto done; - } - - /* now try to get it from the Unix cwd */ - - for (size = 256; ; size *= 2) - { - if (!(cwd = HeapAlloc( GetProcessHeap(), 0, size ))) break; - if (getcwd( cwd, size )) break; - HeapFree( GetProcessHeap(), 0, cwd ); - if (errno == ERANGE) continue; - cwd = NULL; - break; - } - - /* try to use PWD if it is valid, so that we don't resolve symlinks */ - - pwd = getenv( "PWD" ); - if (cwd) - { - struct stat st1, st2; - - if (!pwd || stat( pwd, &st1 ) == -1 || - (!stat( cwd, &st2 ) && (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino))) - pwd = cwd; - } - - if (pwd) - { - ANSI_STRING unix_name; - UNICODE_STRING nt_name; - RtlInitAnsiString( &unix_name, pwd ); - if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) - { - UNICODE_STRING dos_path; - /* skip the \??\ prefix, nt_name is 0 terminated */ - RtlInitUnicodeString( &dos_path, nt_name.Buffer + 4 ); - RtlSetCurrentDirectory_U( &dos_path ); - RtlFreeUnicodeString( &nt_name ); - } - } - - if (!cur_dir->DosPath.Length) /* still not initialized */ - { - MESSAGE("Warning: could not find DOS drive for current working directory '%s', " - "starting in the Windows directory.\n", cwd ? cwd : "" ); - RtlInitUnicodeString( &dir_str, DIR_Windows ); - RtlSetCurrentDirectory_U( &dir_str ); - } - HeapFree( GetProcessHeap(), 0, cwd ); - -done: - TRACE( "starting in %s %p\n", debugstr_w( cur_dir->DosPath.Buffer ), cur_dir->Handle ); -} - - /*********************************************************************** * init_windows_dirs */ @@ -1405,7 +1333,6 @@ void * CDECL __wine_kernel_init(void) } init_windows_dirs(); - init_current_directory( &params->CurrentDirectory ); set_process_name( __wine_main_argc, __wine_main_argv ); set_library_wargv( __wine_main_argv ); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 724faf0b8f..7b5f370083 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -21,7 +21,12 @@ #include "config.h" #include <assert.h> +#include <errno.h> #include <stdarg.h> +#include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -41,6 +46,8 @@ static WCHAR empty[] = {0}; static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; +static const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s',0}; + static inline SIZE_T get_env_length( const WCHAR *env ) { const WCHAR *end = env; @@ -48,6 +55,77 @@ static inline SIZE_T get_env_length( const WCHAR *env ) return end + 1 - env; } +/*********************************************************************** + * get_current_directory + * + * Initialize the current directory from the Unix cwd. + */ +static void get_current_directory( UNICODE_STRING *dir ) +{ + const char *pwd; + char *cwd; + int size; + + dir->Length = 0; + + /* try to get it from the Unix cwd */ + + for (size = 1024; ; size *= 2) + { + if (!(cwd = RtlAllocateHeap( GetProcessHeap(), 0, size ))) break; + if (getcwd( cwd, size )) break; + RtlFreeHeap( GetProcessHeap(), 0, cwd ); + if (errno == ERANGE) continue; + cwd = NULL; + break; + } + + /* try to use PWD if it is valid, so that we don't resolve symlinks */ + + pwd = getenv( "PWD" ); + if (cwd) + { + struct stat st1, st2; + + if (!pwd || stat( pwd, &st1 ) == -1 || + (!stat( cwd, &st2 ) && (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino))) + pwd = cwd; + } + + if (pwd) + { + ANSI_STRING unix_name; + UNICODE_STRING nt_name; + + RtlInitAnsiString( &unix_name, pwd ); + if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) + { + /* skip the \??\ prefix */ + dir->Length = nt_name.Length - 4 * sizeof(WCHAR); + memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + RtlFreeUnicodeString( &nt_name ); + } + } + + if (!dir->Length) /* still not initialized */ + { + MESSAGE("Warning: could not find DOS drive for current working directory '%s', " + "starting in the Windows directory.\n", cwd ? cwd : "" ); + dir->Length = strlenW( windows_dir ) * sizeof(WCHAR); + memcpy( dir->Buffer, windows_dir, dir->Length ); + } + RtlFreeHeap( GetProcessHeap(), 0, cwd ); + + /* add trailing backslash */ + if (dir->Buffer[dir->Length / sizeof(WCHAR) - 1] != '\\') + { + dir->Buffer[dir->Length / sizeof(WCHAR)] = '\\'; + dir->Length += sizeof(WCHAR); + } + dir->Buffer[dir->Length / sizeof(WCHAR)] = 0; +} + + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -554,7 +632,7 @@ void init_user_process_params( SIZE_T data_size ) WCHAR *src; SIZE_T info_size, env_size; NTSTATUS status; - startup_info_t *info; + startup_info_t *info = NULL; RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; @@ -566,6 +644,8 @@ void init_user_process_params( SIZE_T data_size ) return; NtCurrentTeb()->Peb->ProcessParameters = params; + get_current_directory( &params->CurrentDirectory.DosPath ); + if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ if (!isatty(0)) @@ -575,7 +655,7 @@ void init_user_process_params( SIZE_T data_size ) if (!isatty(2)) wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); params->wShowWindow = 1; /* SW_SHOWNORMAL */ - return; + goto done; } if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, data_size ))) return; @@ -603,7 +683,6 @@ void init_user_process_params( SIZE_T data_size ) get_unicode_string( &shellinfo, &src, info->shellinfo_len ); get_unicode_string( &runtime, &src, info->runtime_len ); - curdir.MaximumLength = MAX_PATH * sizeof(WCHAR); /* current directory needs more space */ runtime.MaximumLength = runtime.Length; /* runtime info isn't a real string */ if (RtlCreateProcessParametersEx( &params, &imagepath, &dllpath, &curdir, &cmdline, NULL, @@ -637,6 +716,13 @@ void init_user_process_params( SIZE_T data_size ) done: RtlFreeHeap( GetProcessHeap(), 0, info ); + if (RtlSetCurrentDirectory_U( &params->CurrentDirectory.DosPath )) + { + MESSAGE("wine: could not open working directory %s, starting in the Windows directory.\n", + debugstr_w( params->CurrentDirectory.DosPath.Buffer )); + RtlInitUnicodeString( &curdir, windows_dir ); + RtlSetCurrentDirectory_U( &curdir ); + } }

1 0

Alexandre Julliard : kernel32: Move process name initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: cac959920738317f14b22692a5928e0f1ef0db53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac959920738317f14b22692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:00:57 2019 +0200 kernel32: Move process name initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 66 ------------------------------------------------ dlls/ntdll/thread.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index a60aad6721..1f71a848a3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -37,9 +37,6 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -#ifdef HAVE_SYS_PRCTL_H -# include <sys/prctl.h> -#endif #include <sys/types.h> #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> @@ -1231,68 +1228,6 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) } -/*********************************************************************** - * set_process_name - * - * Change the process name in the ps output. - */ -static void set_process_name( int argc, char *argv[] ) -{ - BOOL shift_strings; - char *p, *name; - int i; - -#ifdef HAVE_SETPROCTITLE - setproctitle("-%s", argv[1]); - shift_strings = FALSE; -#else - p = argv[0]; - - shift_strings = (argc >= 2); - for (i = 1; i < argc; i++) - { - p += strlen(p) + 1; - if (p != argv[i]) - { - shift_strings = FALSE; - break; - } - } -#endif - - if (shift_strings) - { - int offset = argv[1] - argv[0]; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; - memmove( argv[0], argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) - argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - } - else - { - /* remove argv[0] */ - memmove( argv, argv + 1, argc * sizeof(argv[0]) ); - } - - name = argv[0]; - if ((p = strrchr( name, '\\' ))) name = p + 1; - if ((p = strrchr( name, '/' ))) name = p + 1; - -#if defined(HAVE_SETPROGNAME) - setprogname( name ); -#endif - -#ifdef HAVE_PRCTL -#ifndef PR_SET_NAME -# define PR_SET_NAME 15 -#endif - prctl( PR_SET_NAME, name ); -#endif /* HAVE_PRCTL */ -} - - /*********************************************************************** * __wine_kernel_init * @@ -1334,7 +1269,6 @@ void * CDECL __wine_kernel_init(void) init_windows_dirs(); - set_process_name( __wine_main_argc, __wine_main_argv ); set_library_wargv( __wine_main_argv ); boot_events[0] = boot_events[1] = 0; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 97bd4bfeb4..be54f89082 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#ifdef HAVE_SYS_PRCTL_H +# include <sys/prctl.h> +#endif #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif @@ -147,6 +150,69 @@ static ULONG_PTR get_image_addr(void) } #endif + +/*********************************************************************** + * set_process_name + * + * Change the process name in the ps output. + */ +static void set_process_name( int argc, char *argv[] ) +{ + BOOL shift_strings; + char *p, *name; + int i; + +#ifdef HAVE_SETPROCTITLE + setproctitle("-%s", argv[1]); + shift_strings = FALSE; +#else + p = argv[0]; + + shift_strings = (argc >= 2); + for (i = 1; i < argc; i++) + { + p += strlen(p) + 1; + if (p != argv[i]) + { + shift_strings = FALSE; + break; + } + } +#endif + + if (shift_strings) + { + int offset = argv[1] - argv[0]; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + memmove( argv[0], argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < argc; i++) + argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + } + else + { + /* remove argv[0] */ + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); + } + + name = argv[0]; + if ((p = strrchr( name, '\\' ))) name = p + 1; + if ((p = strrchr( name, '/' ))) name = p + 1; + +#if defined(HAVE_SETPROGNAME) + setprogname( name ); +#endif + +#ifdef HAVE_PRCTL +#ifndef PR_SET_NAME +# define PR_SET_NAME 15 +#endif + prctl( PR_SET_NAME, name ); +#endif /* HAVE_PRCTL */ +} + + /*********************************************************************** * thread_init * @@ -245,6 +311,7 @@ void thread_init(void) exit(1); } + set_process_name( __wine_main_argc, __wine_main_argv ); init_directories(); init_user_process_params( info_size );

1 0

Alexandre Julliard : kernel32: Move Unix environment initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: a511057f7e27ebac54fbe43e2ed4f394cae5bef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a511057f7e27ebac54fbe43e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:04:51 2019 +0200 kernel32: Move Unix environment initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 58 +-------------------------------------- dlls/ntdll/env.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1f71a848a3..d03d147d95 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -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(); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 7b5f370083..64bd9b15a3 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -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))

1 0

Alexandre Julliard : kernel32: Move registry environment initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 628ca4aafe2c918744cbbf3079830379f3b936dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=628ca4aafe2c918744cbbf30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:05:24 2019 +0200 kernel32: Move registry environment initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 34 ++++++++++--- dlls/ntdll/env.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d03d147d95..1d6f6b4737 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -507,6 +507,31 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) } +/*********************************************************************** + * has_registry_environment + */ +static BOOL has_registry_environment(void) +{ + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + BOOL ret; + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + RtlInitUnicodeString( &nameW, env_keyW ); + ret = !NtOpenKey( &hkey, KEY_READ, &attr ); + if (ret) NtClose( hkey ); + return ret; +} + + /*********************************************************************** * set_registry_environment * @@ -519,7 +544,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) * %SystemRoot% which are predefined. But Wine defines these in the * registry, so we need two passes. */ -static BOOL set_registry_environment( BOOL volatile_only ) +static void set_registry_environment( BOOL volatile_only ) { static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', 'M','a','c','h','i','n','e','\\', @@ -534,7 +559,6 @@ static BOOL set_registry_environment( BOOL volatile_only ) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE hkey; - BOOL ret = FALSE; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -550,11 +574,10 @@ static BOOL set_registry_environment( BOOL volatile_only ) set_registry_variables( hkey, REG_SZ ); set_registry_variables( hkey, REG_EXPAND_SZ ); NtClose( hkey ); - ret = TRUE; } /* then the ones for the current user */ - if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return ret; + if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return; RtlInitUnicodeString( &nameW, envW ); if (!volatile_only && NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) { @@ -572,7 +595,6 @@ static BOOL set_registry_environment( BOOL volatile_only ) } NtClose( attr.RootDirectory ); - return ret; } @@ -1207,7 +1229,7 @@ void * CDECL __wine_kernel_init(void) /* convert old configuration to new format */ convert_old_config(); - got_environment = set_registry_environment( FALSE ); + got_environment = has_registry_environment(); set_additional_environment(); } diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 64bd9b15a3..1499879271 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -82,6 +82,129 @@ static inline BOOL is_special_env_var( const char *var ) } +/*********************************************************************** + * set_registry_variables + * + * Set environment variables by enumerating the values of a key; + * helper for set_registry_environment(). + * Note that Windows happily truncates the value if it's too big. + */ +static void set_registry_variables( WCHAR **env, HANDLE hkey, ULONG type ) +{ + static const WCHAR pathW[] = {'P','A','T','H'}; + static const WCHAR sep[] = {';',0}; + UNICODE_STRING env_name, env_value; + NTSTATUS status; + DWORD size; + int index; + char buffer[1024*sizeof(WCHAR) + sizeof(KEY_VALUE_FULL_INFORMATION)]; + WCHAR tmpbuf[1024]; + UNICODE_STRING tmp; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + + tmp.Buffer = tmpbuf; + tmp.MaximumLength = sizeof(tmpbuf); + + for (index = 0; ; index++) + { + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buffer, sizeof(buffer), &size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW) break; + if (info->Type != type) continue; + env_name.Buffer = info->Name; + env_name.Length = env_name.MaximumLength = info->NameLength; + env_value.Buffer = (WCHAR *)(buffer + info->DataOffset); + env_value.Length = info->DataLength; + env_value.MaximumLength = sizeof(buffer) - info->DataOffset; + if (env_value.Length && !env_value.Buffer[env_value.Length/sizeof(WCHAR)-1]) + env_value.Length -= sizeof(WCHAR); /* don't count terminating null if any */ + if (!env_value.Length) continue; + if (info->Type == REG_EXPAND_SZ) + { + status = RtlExpandEnvironmentStrings_U( *env, &env_value, &tmp, NULL ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW) continue; + RtlCopyUnicodeString( &env_value, &tmp ); + } + /* PATH is magic */ + if (env_name.Length == sizeof(pathW) && + !strncmpiW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && + !RtlQueryEnvironmentVariable_U( *env, &env_name, &tmp )) + { + RtlAppendUnicodeToString( &tmp, sep ); + if (RtlAppendUnicodeStringToString( &tmp, &env_value )) continue; + RtlCopyUnicodeString( &env_value, &tmp ); + } + RtlSetEnvironmentVariable( env, &env_name, &env_value ); + } +} + + +/*********************************************************************** + * set_registry_environment + * + * Set the environment variables specified in the registry. + * + * Note: Windows handles REG_SZ and REG_EXPAND_SZ in one pass with the + * consequence that REG_EXPAND_SZ cannot be used reliably as it depends + * on the order in which the variables are processed. But on Windows it + * does not really matter since they only use %SystemDrive% and + * %SystemRoot% which are predefined. But Wine defines these in the + * registry, so we need two passes. + */ +static void set_registry_environment( WCHAR **env ) +{ + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR volatile_envW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + /* first the system environment variables */ + RtlInitUnicodeString( &nameW, env_keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + /* then the ones for the current user */ + if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return; + RtlInitUnicodeString( &nameW, envW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + RtlInitUnicodeString( &nameW, volatile_envW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + NtClose( attr.RootDirectory ); +} + + /*********************************************************************** * build_initial_environment * @@ -122,6 +245,7 @@ static WCHAR *build_initial_environment( char **env ) p += strlenW(p) + 1; } *p = 0; + set_registry_environment( &ptr ); return ptr; }

1 0

Alexandre Julliard : kernel32: Move additional environment initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 6b528d526d9894bcffcc6fee37e868d55810f864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b528d526d9894bcffcc6fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:05:43 2019 +0200 kernel32: Move additional environment initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 - dlls/ntdll/env.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1d6f6b4737..27dd77606a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1228,9 +1228,7 @@ void * CDECL __wine_kernel_init(void) { /* convert old configuration to new format */ convert_old_config(); - got_environment = has_registry_environment(); - set_additional_environment(); } init_windows_dirs(); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 1499879271..1b7d848f30 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -205,6 +205,124 @@ static void set_registry_environment( WCHAR **env ) } +/*********************************************************************** + * get_registry_value + */ +static WCHAR *get_registry_value( WCHAR *env, HKEY hkey, const WCHAR *name ) +{ + char buffer[1024 * sizeof(WCHAR) + sizeof(KEY_VALUE_PARTIAL_INFORMATION)]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + DWORD len, size = sizeof(buffer); + WCHAR *ret = NULL; + UNICODE_STRING nameW; + + RtlInitUnicodeString( &nameW, name ); + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size )) + return NULL; + + if (size <= FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data )) return NULL; + len = (size - FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data )) / sizeof(WCHAR); + + if (info->Type == REG_EXPAND_SZ) + { + UNICODE_STRING value, expanded; + + value.MaximumLength = len * sizeof(WCHAR); + value.Buffer = (WCHAR *)info->Data; + if (!value.Buffer[len - 1]) len--; /* don't count terminating null if any */ + value.Length = len * sizeof(WCHAR); + expanded.Length = expanded.MaximumLength = 1024 * sizeof(WCHAR); + if (!(expanded.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, expanded.MaximumLength ))) + return NULL; + if (!RtlExpandEnvironmentStrings_U( env, &value, &expanded, NULL )) ret = expanded.Buffer; + else RtlFreeUnicodeString( &expanded ); + } + else if (info->Type == REG_SZ) + { + if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + memcpy( ret, info->Data, len * sizeof(WCHAR) ); + ret[len] = 0; + } + } + return ret; +} + + +/*********************************************************************** + * set_additional_environment + * + * Set some additional environment variables not specified in the registry. + */ +static void set_additional_environment( WCHAR **env ) +{ + static const WCHAR profile_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','o','f','i','l','e','L','i','s','t',0}; + static const WCHAR computer_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','o','m','p','u','t','e','r','N','a','m','e','\\', + 'A','c','t','i','v','e','C','o','m','p','u','t','e','r','N','a','m','e',0}; + static const WCHAR computer_valueW[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; + static const WCHAR public_valueW[] = {'P','u','b','l','i','c',0}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; + static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; + static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, valW; + WCHAR *val; + HANDLE hkey; + + /* set the user profile variables */ + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + RtlInitUnicodeString( &nameW, profile_keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + if ((val = get_registry_value( *env, hkey, programdataW ))) + { + RtlInitUnicodeString( &valW, val ); + RtlInitUnicodeString( &nameW, allusersW ); + RtlSetEnvironmentVariable( env, &nameW, &valW ); + RtlInitUnicodeString( &nameW, programdataW ); + RtlSetEnvironmentVariable( env, &nameW, &valW ); + RtlFreeHeap( GetProcessHeap(), 0, val ); + } + if ((val = get_registry_value( *env, hkey, public_valueW ))) + { + RtlInitUnicodeString( &valW, val ); + RtlInitUnicodeString( &nameW, publicW ); + RtlSetEnvironmentVariable( env, &nameW, &valW ); + RtlFreeHeap( GetProcessHeap(), 0, val ); + } + NtClose( hkey ); + } + + /* set the computer name */ + + RtlInitUnicodeString( &nameW, computer_keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + if ((val = get_registry_value( *env, hkey, computer_valueW ))) + { + RtlInitUnicodeString( &valW, val ); + RtlInitUnicodeString( &nameW, computernameW ); + RtlSetEnvironmentVariable( env, &nameW, &valW ); + RtlFreeHeap( GetProcessHeap(), 0, val ); + } + NtClose( hkey ); + } +} + + /*********************************************************************** * build_initial_environment * @@ -246,6 +364,7 @@ static WCHAR *build_initial_environment( char **env ) } *p = 0; set_registry_environment( &ptr ); + set_additional_environment( &ptr ); return ptr; }

1 0

Alexandre Julliard : kernel32: Move image path name initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 075741b681553df08e8248e44148e531dfece408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075741b681553df08e8248e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:15:28 2019 +0200 kernel32: Move image path name initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 17 ++---------- dlls/ntdll/env.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 2 ++ dlls/ntdll/ntdll_misc.h | 1 + 4 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 27dd77606a..74382722bb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1236,28 +1236,15 @@ void * CDECL __wine_kernel_init(void) set_library_wargv( __wine_main_argv ); boot_events[0] = boot_events[1] = 0; - if (peb->ProcessParameters->ImagePathName.Buffer) - { - strcpyW( main_exe_name, peb->ProcessParameters->ImagePathName.Buffer ); - } - else + if (!peb->ProcessParameters->WindowTitle.Buffer) { - BOOL is_64bit; - - RtlGetExePath( __wine_main_wargv[0], &load_path ); - if (!SearchPathW( load_path, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && - !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH, &is_64bit )) - { - MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); - ExitProcess( GetLastError() ); - } - RtlReleasePath( load_path ); update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; start_wineboot( boot_events ); } /* if there's no extension, append a dot to prevent LoadLibrary from appending .dll */ + strcpyW( main_exe_name, peb->ProcessParameters->ImagePathName.Buffer ); p = strrchrW( main_exe_name, '.' ); if (!p || strchrW( p, '/' ) || strchrW( p, '\\' )) strcatW( main_exe_name, dotW ); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 1b7d848f30..e41836bacc 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -47,6 +47,8 @@ static WCHAR empty[] = {0}; static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + static const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s',0}; static inline SIZE_T get_env_length( const WCHAR *env ) @@ -440,6 +442,77 @@ static void get_current_directory( UNICODE_STRING *dir ) } +/*********************************************************************** + * is_path_prefix + */ +static inline BOOL is_path_prefix( const WCHAR *prefix, const WCHAR *path, const WCHAR *file ) +{ + DWORD len = strlenW( prefix ); + + if (strncmpiW( path, prefix, len )) return FALSE; + while (path[len] == '\\') len++; + return path + len == file; +} + + +/*********************************************************************** + * get_image_path + */ +static void get_image_path( const char *argv0, UNICODE_STRING *path ) +{ + static const WCHAR exeW[] = {'.','e','x','e',0}; + WCHAR *load_path, *file_part, *name, full_name[MAX_PATH]; + DWORD len; + + len = ntdll_umbstowcs( 0, argv0, strlen(argv0) + 1, NULL, 0 ); + if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto failed; + ntdll_umbstowcs( 0, argv0, strlen(argv0) + 1, name, len ); + + if (RtlDetermineDosPathNameType_U( name ) != RELATIVE_PATH || + strchrW( name, '/' ) || strchrW( name, '\\' )) + { + len = RtlGetFullPathName_U( name, sizeof(full_name), full_name, &file_part ); + if (!len || len > sizeof(full_name)) goto failed; + /* try first without extension */ + if (RtlDoesFileExists_U( full_name )) goto done; + if (len < (MAX_PATH - 4) * sizeof(WCHAR) && !strchrW( file_part, '.' )) + { + strcatW( file_part, exeW ); + if (RtlDoesFileExists_U( full_name )) goto done; + } + /* check for builtin path inside system directory */ + if (!is_path_prefix( system_dir, full_name, file_part )) + { + if (!is_win64 && !is_wow64) goto failed; + if (!is_path_prefix( syswow64_dir, full_name, file_part )) goto failed; + } + } + else + { + RtlGetExePath( name, &load_path ); + len = RtlDosSearchPath_U( load_path, name, exeW, sizeof(full_name), full_name, &file_part ); + RtlReleasePath( load_path ); + if (!len || len > sizeof(full_name)) + { + /* build builtin path inside system directory */ + len = strlenW( system_dir ); + if (strlenW( name ) >= MAX_PATH - 4 - len) goto failed; + strcpyW( full_name, system_dir ); + strcatW( full_name, name ); + if (!strchrW( name, '.' )) strcatW( full_name, exeW ); + } + } +done: + RtlCreateUnicodeString( path, full_name ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + return; + +failed: + MESSAGE( "wine: cannot find '%s'\n", argv0 ); + RtlExitUserProcess( GetLastError() ); +} + + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -960,6 +1033,7 @@ void init_user_process_params( SIZE_T data_size ) NtCurrentTeb()->Peb->ProcessParameters = params; params->Environment = build_initial_environment( __wine_get_main_environment() ); get_current_directory( &params->CurrentDirectory.DosPath ); + get_image_path( __wine_main_argv[0], &params->ImagePathName ); if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e33c24d7af..2bae3c7bd5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -67,6 +67,8 @@ typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); /* system directory with trailing backslash */ const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\',0}; +const WCHAR syswow64_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','w','o','w','6','4','\\',0}; /* system search path */ static const WCHAR system_path[] = diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 04aa15636d..20e64c80c7 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -123,6 +123,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; +extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; extern void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : kernel32: Move Unicode argv initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: ee56be3fcdc56caa9727ce4c3e5e3155cd900905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee56be3fcdc56caa9727ce4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:16:58 2019 +0200 kernel32: Move Unicode argv initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 61 ++++++++----------------------------------------- dlls/ntdll/env.c | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 74382722bb..cc76ad9d27 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -835,45 +835,28 @@ static void set_wow64_environment(void) } /*********************************************************************** - * set_library_wargv + * set_library_argv * - * Set the Wine library Unicode argv global variables. + * Set the Wine library argv global variables. */ -static void set_library_wargv( char **argv ) +static void set_library_argv( WCHAR **wargv ) { int argc; - char *q; - WCHAR *p; - WCHAR **wargv; + char *p, **argv; DWORD total = 0; - for (argc = 0; argv[argc]; argc++) - total += MultiByteToWideChar( CP_UNIXCP, 0, argv[argc], -1, NULL, 0 ); - - wargv = RtlAllocateHeap( GetProcessHeap(), 0, - total * sizeof(WCHAR) + (argc + 1) * sizeof(*wargv) ); - p = (WCHAR *)(wargv + argc + 1); - for (argc = 0; argv[argc]; argc++) - { - DWORD reslen = MultiByteToWideChar( CP_UNIXCP, 0, argv[argc], -1, p, total ); - wargv[argc] = p; - p += reslen; - total -= reslen; - } - wargv[argc] = NULL; - /* convert argv back from Unicode since it has to be in the Ansi codepage not the Unix one */ for (argc = 0; wargv[argc]; argc++) total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); argv = RtlAllocateHeap( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); - q = (char *)(argv + argc + 1); + p = (char *)(argv + argc + 1); for (argc = 0; wargv[argc]; argc++) { - DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, q, total, NULL, NULL ); - argv[argc] = q; - q += reslen; + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; total -= reslen; } argv[argc] = NULL; @@ -884,30 +867,6 @@ static void set_library_wargv( char **argv ) } -/*********************************************************************** - * update_library_argv0 - * - * Update the argv[0] global variable with the binary we have found. - */ -static void update_library_argv0( const WCHAR *argv0 ) -{ - DWORD len = strlenW( argv0 ); - - if (len > strlenW( __wine_main_wargv[0] )) - { - __wine_main_wargv[0] = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - } - strcpyW( __wine_main_wargv[0], argv0 ); - - len = WideCharToMultiByte( CP_ACP, 0, argv0, -1, NULL, 0, NULL, NULL ); - if (len > strlen( __wine_main_argv[0] ) + 1) - { - __wine_main_argv[0] = RtlAllocateHeap( GetProcessHeap(), 0, len ); - } - WideCharToMultiByte( CP_ACP, 0, argv0, -1, __wine_main_argv[0], len, NULL, NULL ); -} - - /*********************************************************************** * build_command_line * @@ -1232,13 +1191,10 @@ void * CDECL __wine_kernel_init(void) } init_windows_dirs(); - - set_library_wargv( __wine_main_argv ); boot_events[0] = boot_events[1] = 0; if (!peb->ProcessParameters->WindowTitle.Buffer) { - update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; start_wineboot( boot_events ); } @@ -1269,6 +1225,7 @@ void * CDECL __wine_kernel_init(void) set_additional_environment(); } set_wow64_environment(); + set_library_argv( __wine_main_wargv ); if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) { diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index e41836bacc..4fbe9a8411 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -513,6 +513,45 @@ failed: } +/*********************************************************************** + * set_library_wargv + * + * Set the Wine library Unicode argv global variables. + */ +static void set_library_wargv( char **argv, const UNICODE_STRING *image ) +{ + int argc; + WCHAR *p, **wargv; + DWORD total = 0; + + if (image) total += 1 + image->Length / sizeof(WCHAR); + for (argc = (image != NULL); argv[argc]; argc++) + total += ntdll_umbstowcs( 0, argv[argc], strlen(argv[argc]) + 1, NULL, 0 ); + + wargv = RtlAllocateHeap( GetProcessHeap(), 0, + total * sizeof(WCHAR) + (argc + 1) * sizeof(*wargv) ); + p = (WCHAR *)(wargv + argc + 1); + if (image) + { + strcpyW( p, image->Buffer ); + wargv[0] = p; + p += 1 + image->Length / sizeof(WCHAR); + total -= 1 + image->Length / sizeof(WCHAR); + } + for (argc = (image != NULL); argv[argc]; argc++) + { + DWORD reslen = ntdll_umbstowcs( 0, argv[argc], strlen(argv[argc]) + 1, p, total ); + wargv[argc] = p; + p += reslen; + total -= reslen; + } + wargv[argc] = NULL; + + __wine_main_argc = argc; + __wine_main_wargv = wargv; +} + + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -1034,6 +1073,7 @@ void init_user_process_params( SIZE_T data_size ) params->Environment = build_initial_environment( __wine_get_main_environment() ); get_current_directory( &params->CurrentDirectory.DosPath ); get_image_path( __wine_main_argv[0], &params->ImagePathName ); + set_library_wargv( __wine_main_argv, &params->ImagePathName ); if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ @@ -1103,6 +1143,8 @@ void init_user_process_params( SIZE_T data_size ) else params->Environment[0] = 0; } + set_library_wargv( __wine_main_argv, NULL ); + done: RtlFreeHeap( GetProcessHeap(), 0, info ); if (RtlSetCurrentDirectory_U( &params->CurrentDirectory.DosPath ))

1 0

Alexandre Julliard : kernel32: Move command line initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 2607bfa28fcbaf1ca4ab0f65c3b6ad905ae70f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2607bfa28fcbaf1ca4ab0f65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:17:14 2019 +0200 kernel32: Move command line initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 156 +----------------------------------------------- dlls/ntdll/env.c | 86 ++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 154 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cc76ad9d27..55630dc6dd 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -867,149 +867,6 @@ static void set_library_argv( WCHAR **wargv ) } -/*********************************************************************** - * build_command_line - * - * Build the command line of a process from the argv array. - * - * Note that it does NOT necessarily include the file name. - * Sometimes we don't even have any command line options at all. - * - * We must quote and escape characters so that the argv array can be rebuilt - * from the command line: - * - spaces and tabs must be quoted - * 'a b' -> '"a b"' - * - quotes must be escaped - * '"' -> '\"' - * - if '\'s are followed by a '"', they must be doubled and followed by '\"', - * resulting in an odd number of '\' followed by a '"' - * '\"' -> '\\\"' - * '\\"' -> '\\\\\"' - * - '\'s are followed by the closing '"' must be doubled, - * resulting in an even number of '\' followed by a '"' - * ' \' -> '" \\"' - * ' \\' -> '" \\\\"' - * - '\'s that are not followed by a '"' can be left as is - * 'a\b' == 'a\b' - * 'a\\b' == 'a\\b' - */ -static BOOL build_command_line( WCHAR **argv ) -{ - int len; - WCHAR **arg; - LPWSTR p; - RTL_USER_PROCESS_PARAMETERS* rupp = NtCurrentTeb()->Peb->ProcessParameters; - - if (rupp->CommandLine.Buffer) return TRUE; /* already got it from the server */ - - len = 0; - for (arg = argv; *arg; arg++) - { - BOOL has_space; - int bcount; - WCHAR* a; - - has_space=FALSE; - bcount=0; - a=*arg; - if( arg == argv || !*a ) has_space=TRUE; - while (*a!='\0') { - if (*a=='\\') { - bcount++; - } else { - if (*a==' ' || *a=='\t') { - has_space=TRUE; - } else if (*a=='"') { - /* doubling of '\' preceding a '"', - * plus escaping of said '"' - */ - len+=2*bcount+1; - } - bcount=0; - } - a++; - } - len+=(a-*arg)+1 /* for the separating space */; - if (has_space) - len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ - } - - if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) - return FALSE; - - p = rupp->CommandLine.Buffer; - rupp->CommandLine.Length = (len - 1) * sizeof(WCHAR); - rupp->CommandLine.MaximumLength = len * sizeof(WCHAR); - for (arg = argv; *arg; arg++) - { - BOOL has_space,has_quote; - WCHAR* a; - int bcount; - - /* Check for quotes and spaces in this argument */ - has_space=has_quote=FALSE; - a=*arg; - if( arg == argv || !*a ) has_space=TRUE; - while (*a!='\0') { - if (*a==' ' || *a=='\t') { - has_space=TRUE; - if (has_quote) - break; - } else if (*a=='"') { - has_quote=TRUE; - if (has_space) - break; - } - a++; - } - - /* Now transfer it to the command line */ - if (has_space) - *p++='"'; - if (has_quote || has_space) { - bcount=0; - a=*arg; - while (*a!='\0') { - if (*a=='\\') { - *p++=*a; - bcount++; - } else { - if (*a=='"') { - int i; - - /* Double all the '\\' preceding this '"', plus one */ - for (i=0;i<=bcount;i++) - *p++='\\'; - *p++='"'; - } else { - *p++=*a; - } - bcount=0; - } - a++; - } - } else { - WCHAR* x = *arg; - while ((*p=*x++)) p++; - } - if (has_space) { - int i; - - /* Double all the '\' preceding the closing quote */ - for (i=0;i<bcount;i++) - *p++='\\'; - *p++='"'; - } - *p++=' '; - } - if (p > rupp->CommandLine.Buffer) - p--; /* remove last space */ - *p = '\0'; - - return TRUE; -} - - /*********************************************************************** * init_windows_dirs */ @@ -1182,20 +1039,14 @@ void * CDECL __wine_kernel_init(void) RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); + init_windows_dirs(); + boot_events[0] = boot_events[1] = 0; if (!peb->ProcessParameters->WindowTitle.Buffer) { /* convert old configuration to new format */ convert_old_config(); got_environment = has_registry_environment(); - } - - init_windows_dirs(); - boot_events[0] = boot_events[1] = 0; - - if (!peb->ProcessParameters->WindowTitle.Buffer) - { - if (!build_command_line( __wine_main_wargv )) goto error; start_wineboot( boot_events ); } @@ -1265,9 +1116,6 @@ void * CDECL __wine_kernel_init(void) if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ return start_process_wrapper; - - error: - ExitProcess( GetLastError() ); } diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 4fbe9a8411..ac0e2621ed 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -552,6 +552,91 @@ static void set_library_wargv( char **argv, const UNICODE_STRING *image ) } +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * + * Note that it does NOT necessarily include the file name. + * Sometimes we don't even have any command line options at all. + * + * We must quote and escape characters so that the argv array can be rebuilt + * from the command line: + * - spaces and tabs must be quoted + * 'a b' -> '"a b"' + * - quotes must be escaped + * '"' -> '\"' + * - if '\'s are followed by a '"', they must be doubled and followed by '\"', + * resulting in an odd number of '\' followed by a '"' + * '\"' -> '\\\"' + * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' + * - '\'s that are not followed by a '"' can be left as is + * 'a\b' == 'a\b' + * 'a\\b' == 'a\\b' + */ +static void build_command_line( WCHAR **argv, UNICODE_STRING *cmdline ) +{ + int len; + WCHAR **arg; + LPWSTR p; + + len = 1; + for (arg = argv; *arg; arg++) len += 3 + 2 * strlenW( *arg ); + cmdline->MaximumLength = len * sizeof(WCHAR); + if (!(cmdline->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, cmdline->MaximumLength ))) return; + + p = cmdline->Buffer; + for (arg = argv; *arg; arg++) + { + BOOL has_space, has_quote; + int i, bcount; + WCHAR *a; + + /* check for quotes and spaces in this argument */ + if (arg == argv || !**arg) has_space = TRUE; + else has_space = strchrW( *arg, ' ' ) || strchrW( *arg, '\t' ); + has_quote = strchrW( *arg, '"' ) != NULL; + + /* now transfer it to the command line */ + if (has_space) *p++ = '"'; + if (has_quote || has_space) + { + bcount = 0; + for (a = *arg; *a; a++) + { + if (*a == '\\') bcount++; + else + { + if (*a == '"') /* double all the '\\' preceding this '"', plus one */ + for (i = 0; i <= bcount; i++) *p++ = '\\'; + bcount = 0; + } + *p++ = *a; + } + } + else + { + strcpyW( p, *arg ); + p += strlenW( p ); + } + if (has_space) + { + /* Double all the '\' preceding the closing quote */ + for (i = 0; i < bcount; i++) *p++ = '\\'; + *p++ = '"'; + } + *p++ = ' '; + } + if (p > cmdline->Buffer) p--; /* remove last space */ + *p = 0; + cmdline->Length = (p - cmdline->Buffer) * sizeof(WCHAR); +} + + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -1074,6 +1159,7 @@ void init_user_process_params( SIZE_T data_size ) get_current_directory( &params->CurrentDirectory.DosPath ); get_image_path( __wine_main_argv[0], &params->ImagePathName ); set_library_wargv( __wine_main_argv, &params->ImagePathName ); + build_command_line( __wine_main_wargv, &params->CommandLine ); if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */

1 0

Alexandre Julliard : kernel32: Move dll load path initialization to ntdll.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: fd3735cf4dd55b5c582bd51bb03647e5eaf12847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3735cf4dd55b5c582bd51b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:17:36 2019 +0200 kernel32: Move dll load path initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 ---- dlls/ntdll/env.c | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 55630dc6dd..36ed82bff8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1028,7 +1028,6 @@ void * CDECL __wine_kernel_init(void) RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; HANDLE boot_events[2]; BOOL got_environment = TRUE; - WCHAR *load_path, *dummy; /* Initialize everything */ @@ -1058,9 +1057,6 @@ void * CDECL __wine_kernel_init(void) TRACE( "starting process name=%s argv[0]=%s\n", debugstr_w(main_exe_name), debugstr_w(__wine_main_wargv[0]) ); - LdrGetDllPath( main_exe_name, 0, &load_path, &dummy ); - RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, load_path ); - if (boot_events[0]) { DWORD timeout = 2 * 60 * 1000, count = 1; diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ac0e2621ed..919fc64e2f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1140,7 +1140,7 @@ static inline void get_unicode_string( UNICODE_STRING *str, WCHAR **src, UINT le */ void init_user_process_params( SIZE_T data_size ) { - WCHAR *src; + WCHAR *src, *load_path, *dummy; SIZE_T info_size, env_size; NTSTATUS status; startup_info_t *info = NULL; @@ -1160,6 +1160,9 @@ void init_user_process_params( SIZE_T data_size ) get_image_path( __wine_main_argv[0], &params->ImagePathName ); set_library_wargv( __wine_main_argv, &params->ImagePathName ); build_command_line( __wine_main_wargv, &params->CommandLine ); + LdrGetDllPath( params->ImagePathName.Buffer, 0, &load_path, &dummy ); + RtlCreateUnicodeString( &params->DllPath, load_path ); + RtlReleasePath( load_path ); if (isatty(0) || isatty(1) || isatty(2)) params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */

1 0