highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 21:04:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.4.x' into 0.5.0.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-03-03 13:59:19 -05:00
parent ef48e9b7df 88aa771536
commit 7013cc3d97
9 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/util.cpp
View File

@@ -737,26 +737,35 @@ string MyGetSpecialFolderPath(int nFolder, bool fCreate)
{
PSHGETSPECIALFOLDERPATHA pSHGetSpecialFolderPath =
(PSHGETSPECIALFOLDERPATHA)GetProcAddress(hShell32, "SHGetSpecialFolderPathA");
bool fSuccess = false;
if (pSHGetSpecialFolderPath)
fSuccess =
(*pSHGetSpecialFolderPath)(NULL, pszPath, nFolder, fCreate);
FreeModule(hShell32);
if (fSuccess)
return pszPath;
}
// Backup option
if (pszPath[0] == '\0')
std::string strPath;
{
const char *pszEnv;
if (nFolder == CSIDL_STARTUP)
{
strcpy(pszPath, getenv("USERPROFILE"));
strcat(pszPath, "\\Start Menu\\Programs\\Startup");
pszEnv = getenv("USERPROFILE");
if (pszEnv)
strPath = pszEnv;
strPath += "\\Start Menu\\Programs\\Startup";
}
else if (nFolder == CSIDL_APPDATA)
{
strcpy(pszPath, getenv("APPDATA"));
pszEnv = getenv("APPDATA");
if (pszEnv)
strPath = pszEnv;
}
}
return pszPath;
return strPath;
}
#endif