Browse Source

Merge branch '2012_02_getspecialfolderpath_overflow' of https://github.com/laanwj/bitcoin

0.8
Gavin Andresen 13 years ago
parent
commit
6dd5ae41ac
  1. 37
      src/util.cpp

37
src/util.cpp

@ -787,46 +787,23 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread)
strMiscWarning = pszMessage; strMiscWarning = pszMessage;
} }
#ifdef WIN32 #ifdef WIN32
typedef WINSHELLAPI BOOL (WINAPI *PSHGETSPECIALFOLDERPATHA)(HWND hwndOwner, LPSTR lpszPath, int nFolder, BOOL fCreate);
string MyGetSpecialFolderPath(int nFolder, bool fCreate) string MyGetSpecialFolderPath(int nFolder, bool fCreate)
{ {
char pszPath[MAX_PATH+100] = ""; char pszPath[MAX_PATH] = "";
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate))
// SHGetSpecialFolderPath isn't always available on old Windows versions
HMODULE hShell32 = LoadLibraryA("shell32.dll");
if (hShell32)
{ {
PSHGETSPECIALFOLDERPATHA pSHGetSpecialFolderPath = return pszPath;
(PSHGETSPECIALFOLDERPATHA)GetProcAddress(hShell32, "SHGetSpecialFolderPathA");
if (pSHGetSpecialFolderPath)
(*pSHGetSpecialFolderPath)(NULL, pszPath, nFolder, fCreate);
FreeModule(hShell32);
} }
else if (nFolder == CSIDL_STARTUP)
// Backup option
if (pszPath[0] == '\0')
{
if (nFolder == CSIDL_STARTUP)
{ {
strcpy(pszPath, getenv("USERPROFILE")); return string(getenv("USERPROFILE")) + "\\Start Menu\\Programs\\Startup";
strcat(pszPath, "\\Start Menu\\Programs\\Startup");
} }
else if (nFolder == CSIDL_APPDATA) else if (nFolder == CSIDL_APPDATA)
{ {
strcpy(pszPath, getenv("APPDATA")); return getenv("APPDATA");
} }
} return "";
return pszPath;
} }
#endif #endif

Loading…
Cancel
Save