marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

userenv: Fix setting the ALLUSERSPROFILE environment variable. 

Since 27edd4e35c ALLUSERSPROFILE is set to
C:\\users\\C:\\users\\Public. This is because the expanded registry
value of "Public" is appended to "ProfilesDirectory" and "Public" expands
to a full path. AllUsersProfile, used before this commit, expanded to just
"Public".

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Hans Leidekker 2018-09-05 12:38:50 +02:00 committed by Alexandre Julliard
parent a37d8a203d
commit fd044802b9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/userenv/userenv_main.c
View File

@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment,
static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0};
static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0};
static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0};
static const WCHAR PublicW[] = {'P','u','b','l','i','c',0};
static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0};
static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0};
static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0};
@ -323,8 +323,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment,
profiles_dir[len] = '\0';
}
memcpy(buf, profiles_dir, len*sizeof(WCHAR));
if (get_reg_value(env, hkey, AllUsersProfileW, buf+len, UNICODE_STRING_MAX_CHARS-len))
if (get_reg_value(env, hkey, PublicW, buf, UNICODE_STRING_MAX_CHARS))
{
RtlInitUnicodeString(&us_name, ALLUSERSPROFILEW);
RtlInitUnicodeString(&us_val, buf);