Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client & MGR: On Windows, handle expansion of environment variables in the registry value that stores DATADIR.

This commit is contained in:
Rom Walton 2014-05-06 11:28:47 -04:00
parent 640d6dc16a
commit 1bbc5e96e2
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clientgui/BOINCGUIApp.cpp
View File

@ -815,9 +815,11 @@ void CBOINCGUIApp::DetectDataDirectory() {
//
LONG lReturnValue;
HKEY hkSetupHive;
LPTSTR lpszRegistryValue = NULL;
TCHAR szPath[MAX_PATH];
DWORD dwSize = 0;
LPTSTR lpszValue = NULL;
LPTSTR lpszExpandedValue = NULL;
DWORD dwValueType = REG_EXPAND_SZ;
DWORD dwSize = 0;
// change the current directory to the boinc data directory if it exists
lReturnValue = RegOpenKeyEx(
@ -833,27 +835,41 @@ void CBOINCGUIApp::DetectDataDirectory() {
hkSetupHive,
_T("DATADIR"),
NULL,
NULL,
&dwValueType,
NULL,
&dwSize
);
if (lReturnValue != ERROR_FILE_NOT_FOUND) {
// Allocate the buffer space.
lpszRegistryValue = (LPTSTR) malloc(dwSize);
(*lpszRegistryValue) = NULL;
lpszValue = (LPTSTR) malloc(dwSize);
(*lpszValue) = NULL;
// Now get the data
lReturnValue = RegQueryValueEx(
hkSetupHive,
_T("DATADIR"),
NULL,
NULL,
(LPBYTE)lpszRegistryValue,
&dwValueType,
(LPBYTE)lpszValue,
&dwSize
);
// Store the root directory for later use.
m_strBOINCMGRDataDirectory = lpszRegistryValue;
// Expand the Strings
// We need to get the size of the buffer needed
dwSize = 0;
lReturnValue = ExpandEnvironmentStrings(lpszValue, NULL, dwSize);
if (lReturnValue) {
// Make the buffer big enough for the expanded string
lpszExpandedValue = (LPTSTR) malloc(lReturnValue*sizeof(TCHAR));
(*lpszExpandedValue) = NULL;
dwSize = lReturnValue;
ExpandEnvironmentStrings(lpszValue, lpszExpandedValue, dwSize);
// Store the root directory for later use.
m_strBOINCMGRDataDirectory = lpszExpandedValue;
}
}
} else {
if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, szPath))) {
@ -867,7 +883,8 @@ void CBOINCGUIApp::DetectDataDirectory() {
// Cleanup
if (hkSetupHive) RegCloseKey(hkSetupHive);
if (lpszRegistryValue) free(lpszRegistryValue);
if (lpszValue) free(lpszValue);
if (lpszExpandedValue) free(lpszExpandedValue);
#endif
#ifdef __WXMAC__
m_strBOINCMGRDataDirectory = wxT("/Library/Application Support/BOINC Data");

33
lib/win_util.cpp
View File

@ -52,8 +52,10 @@ BOOL TerminateProcessById( DWORD dwProcessID ) {
void chdir_to_data_dir() {
LONG lReturnValue;
HKEY hkSetupHive;
LPSTR lpszRegistryValue = NULL;
char szPath[MAX_PATH];
LPSTR lpszValue = NULL;
LPSTR lpszExpandedValue = NULL;
DWORD dwValueType = REG_EXPAND_SZ;
DWORD dwSize = 0;
// change the current directory to the boinc data directory if it exists
@ -70,26 +72,40 @@ void chdir_to_data_dir() {
hkSetupHive,
"DATADIR",
NULL,
NULL,
&dwValueType,
NULL,
&dwSize
);
if (lReturnValue != ERROR_FILE_NOT_FOUND) {
// Allocate the buffer space.
lpszRegistryValue = (LPSTR) malloc(dwSize);
(*lpszRegistryValue) = NULL;
lpszValue = (LPSTR) malloc(dwSize);
(*lpszValue) = NULL;
// Now get the data
lReturnValue = RegQueryValueExA(
hkSetupHive,
"DATADIR",
NULL,
NULL,
(LPBYTE)lpszRegistryValue,
&dwValueType,
(LPBYTE)lpszValue,
&dwSize
);
SetCurrentDirectoryA(lpszRegistryValue);
// Expand the Strings
// We need to get the size of the buffer needed
dwSize = 0;
lReturnValue = ExpandEnvironmentStringsA(lpszValue, NULL, dwSize);
if (lReturnValue) {
// Make the buffer big enough for the expanded string
lpszExpandedValue = (LPSTR) malloc(lReturnValue);
(*lpszExpandedValue) = NULL;
dwSize = lReturnValue;
ExpandEnvironmentStringsA(lpszValue, lpszExpandedValue, dwSize);
SetCurrentDirectoryA(lpszExpandedValue);
}
}
} else {
if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_COMMON_APPDATA|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, szPath))) {
@ -101,7 +117,8 @@ void chdir_to_data_dir() {
}
if (hkSetupHive) RegCloseKey(hkSetupHive);
if (lpszRegistryValue) free(lpszRegistryValue);
if (lpszValue) free(lpszValue);
if (lpszExpandedValue) free(lpszExpandedValue);
}
std::wstring A2W(const std::string& str) {