better solution - don't old functions and not shfolder but still try to get all user's version from the os (though tests show it will return current user's version anyway)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5238 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
b55ecee8cd
commit
35e1cf7b86
1 changed files with 2 additions and 2 deletions
|
@ -635,7 +635,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
|
||||||
(fldrs[2] != CSIDL_COMMON_APPDATA) // not all users's appdata
|
(fldrs[2] != CSIDL_COMMON_APPDATA) // not all users's appdata
|
||||||
);
|
);
|
||||||
|
|
||||||
if (g_exec_flags.all_user_var && all_users_9x_capable)
|
if (g_exec_flags.all_user_var)
|
||||||
{
|
{
|
||||||
x = 4;
|
x = 4;
|
||||||
}
|
}
|
||||||
|
@ -660,7 +660,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
|
||||||
|
|
||||||
while (x--)
|
while (x--)
|
||||||
{
|
{
|
||||||
if (g_SHGetFolderPath)
|
if (g_SHGetFolderPath && all_users_9x_capable)
|
||||||
{
|
{
|
||||||
PFNSHGETFOLDERPATHA SHGetFolderPathFunc = (PFNSHGETFOLDERPATHA) g_SHGetFolderPath;
|
PFNSHGETFOLDERPATHA SHGetFolderPathFunc = (PFNSHGETFOLDERPATHA) g_SHGetFolderPath;
|
||||||
if (!SHGetFolderPathFunc(g_hwnd, fldrs[x], NULL, SHGFP_TYPE_CURRENT, out))
|
if (!SHGetFolderPathFunc(g_hwnd, fldrs[x], NULL, SHGFP_TYPE_CURRENT, out))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue