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

userenv: Use wide-char string literals. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-11-17 00:55:18 +01:00 committed by Alexandre Julliard
parent 48e35424a6
commit d7e43c9e31
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/userenv/userenv_main.c
View File

@ -418,7 +418,6 @@ BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir,
BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir,
LPDWORD lpcchSize ) LPDWORD lpcchSize )
{ {
static const WCHAR slashW[] = {'\\',0};
TOKEN_USER *t; TOKEN_USER *t;
WCHAR *userW = NULL, *dirW = NULL; WCHAR *userW = NULL, *dirW = NULL;
DWORD len, dir_len, domain_len; DWORD len, dir_len, domain_len;
@ -459,7 +458,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir,
goto done; goto done;
} }
lstrcpyW( lpProfileDir, dirW ); lstrcpyW( lpProfileDir, dirW );
lstrcatW( lpProfileDir, slashW ); lstrcatW( lpProfileDir, L"\\" );
lstrcatW( lpProfileDir, userW ); lstrcatW( lpProfileDir, userW );
*lpcchSize = len; *lpcchSize = len;
ret = TRUE; ret = TRUE;
@ -533,11 +532,8 @@ end:
return ret; return ret;
} }
static const WCHAR ProfileListW[] = {'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};
BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
{ {
static const WCHAR ProfilesDirectory[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0};
LONG l; LONG l;
HKEY key; HKEY key;
BOOL ret = FALSE; BOOL ret = FALSE;
@ -552,13 +548,15 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
return FALSE; return FALSE;
} }
l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, KEY_READ, &key); l = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList",
0, KEY_READ, &key);
if (l) if (l)
{ {
SetLastError(l); SetLastError(l);
return FALSE; return FALSE;
} }
l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, NULL, &len); l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL, NULL, &len);
if (l) if (l)
{ {
SetLastError(l); SetLastError(l);
@ -570,7 +568,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize )
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
goto end; goto end;
} }
l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL,
(BYTE *)unexpanded_profiles_dir, &len); (BYTE *)unexpanded_profiles_dir, &len);
if (l) if (l)
{ {