$LocalAppData now resolves to the ProgramData folder in the "SetShellVarContext all" context

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6875 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-06-23 01:11:30 +00:00
parent decb52f505
commit 2553c6e550
6 changed files with 7 additions and 4 deletions

View file

@ -364,7 +364,7 @@ CEXEBuild::CEXEBuild(signed char pponly) :
m_ShellConstants.add(_T("FONTS"), CSIDL_FONTS, CSIDL_FONTS);
m_ShellConstants.add(_T("TEMPLATES"), CSIDL_TEMPLATES, CSIDL_COMMON_TEMPLATES);
m_ShellConstants.add(_T("APPDATA"), CSIDL_APPDATA, CSIDL_COMMON_APPDATA);
m_ShellConstants.add(_T("LOCALAPPDATA"), CSIDL_LOCAL_APPDATA, CSIDL_LOCAL_APPDATA);
m_ShellConstants.add(_T("LOCALAPPDATA"), CSIDL_LOCAL_APPDATA, CSIDL_COMMON_APPDATA);
m_ShellConstants.add(_T("PRINTHOOD"), CSIDL_PRINTHOOD, CSIDL_PRINTHOOD);
//m_ShellConstants.add(_T("ALTSTARTUP"), CSIDL_ALTSTARTUP, CSIDL_COMMON_ALTSTARTUP);
m_ShellConstants.add(_T("INTERNET_CACHE"), CSIDL_INTERNET_CACHE, CSIDL_INTERNET_CACHE);

View file

@ -845,7 +845,7 @@ TCHAR * NSISCALL GetNSISString(TCHAR *outbuf, int strtab)
*/
BOOL use_shfolder =
// Use shfolder if not on 95/98
!((ver & 0x80000000) && (LOWORD(ver) != 0x5A04)) ||
!((ver & 0x80000000) && (LOWORD(ver) != MAKEWORD(4,90))) ||
// Unless the Application Data or Documents folder is requested
(

View file

@ -49,6 +49,7 @@ static const struct { const TCHAR *name, *guidstr; } g_soslmap[] = {
bool SupportedOSList::addall()
{
m_isdefaultlist = false;
for (UINT i = 0; i < COUNTOF(g_soslmap); ++i)
if (!append(g_soslmap[i].name))
return false;