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

shell32: Assume that system directory always contains a drive letter. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-09-06 12:48:49 +02:00
parent 89c2553503
commit 54530bc493
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/shell32/shellpath.c
View File

@ -3792,8 +3792,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
/* get the system drive */ /* get the system drive */
GetSystemDirectoryW(def_val, MAX_PATH); GetSystemDirectoryW(def_val, MAX_PATH);
if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); strcpyW( def_val + 3, szDefaultProfileDirW );
else FIXME("non-drive system paths unsupported\n");
hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val );
} }
@ -3807,8 +3806,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH];
GetSystemDirectoryW(def_val, MAX_PATH); GetSystemDirectoryW(def_val, MAX_PATH);
if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); strcpyW( def_val + 3, UsersPublicW );
else FIXME("non-drive system paths unsupported\n");
hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val);
PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szAllUsers);
@ -3833,8 +3831,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
if (!in_registry) if (!in_registry)
{ {
GetSystemDirectoryW(def_val, MAX_PATH); GetSystemDirectoryW(def_val, MAX_PATH);
if (def_val[1] == ':') strcpyW( def_val + 3, ProgramDataW ); strcpyW( def_val + 3, ProgramDataW );
else FIXME("non-drive system paths unsupported\n");
} }
hr = _SHGetProfilesValue(key, ProgramDataW, szProgramData, def_val); hr = _SHGetProfilesValue(key, ProgramDataW, szProgramData, def_val);
@ -3854,16 +3851,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW))) else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW)))
{ {
GetSystemDirectoryW(szDest, MAX_PATH); GetSystemDirectoryW(szDest, MAX_PATH);
if (szDest[1] != ':') strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1);
{
FIXME("non-drive system paths unsupported\n");
hr = E_FAIL;
}
else
{
strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1);
hr = S_OK;
}
} }
else else
{ {