gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lookup of Visual Studio directories + improve error messages

Browse Source 
Visual Studio 2017 doesn't use the registry anymore, so no need to try to find keys. This prevent picking wrong directories in the case there is another version installed on the computer, and prevent also the following errors when starting ROOT:
  RegQueryValueEx: returned 2: The system cannot find the file specified.
  RegOpenKeyEx: returned 2: The system cannot find the file specified.
This commit is contained in:
Bertrand Bellenot 2018-09-25 10:24:44 +02:00 committed by sftnight
parent 973ae34948
commit 4ed58df12d
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Utils/PlatformWin.cpp
View File

@ -132,7 +132,10 @@ static bool readFullStringValue(HKEY hkey, const char *valueName,
}
}
ReportError(result, "RegQueryValueEx");
std::string prefix("RegQueryValueEx(");
prefix += valueName;
prefix += ")";
ReportError(result, prefix.c_str());
return false;
}
@ -189,12 +192,13 @@ static bool getVSEnvironmentString(int VSVersion, std::string& Path,
static bool getVisualStudioVer(int VSVersion, std::string& Path,
const char* Verbose) {
if (getVSRegistryString("VisualStudio", VSVersion, Path, Verbose))
return true;
if (getVSRegistryString("VCExpress", VSVersion, Path, Verbose))
return true;
if (VSVersion < 15) {
if (getVSRegistryString("VisualStudio", VSVersion, Path, Verbose))
return true;
if (getVSRegistryString("VCExpress", VSVersion, Path, Verbose))
return true;
}
if (getVSEnvironmentString(VSVersion, Path, Verbose))
return true;
@ -282,6 +286,11 @@ bool GetSystemRegistryString(const char *keyPath, const char *valueName,
long lResult;
bool returnValue = false;
HKEY hKey = NULL;
std::string prefix("RegOpenKeyEx(");
prefix += keyPath;
prefix += "\\";
prefix += valueName;
prefix += ")";
// If we have a $VERSION placeholder, do the highest-version search.
if (const char *placeHolder = ::strstr(subKey, "$VERSION")) {
@ -347,7 +356,7 @@ bool GetSystemRegistryString(const char *keyPath, const char *valueName,
}
::RegCloseKey(hTopKey);
} else
ReportError(lResult, "RegOpenKeyEx");
ReportError(lResult, prefix.c_str());
} else {
// If subKey is empty, then valueName is subkey, and we retreive that
if (subKey[0]==0) {
@ -360,7 +369,7 @@ bool GetSystemRegistryString(const char *keyPath, const char *valueName,
returnValue = readFullStringValue(hKey, valueName, outValue);
::RegCloseKey(hKey);
} else
ReportError(lResult, "RegOpenKeyEx");
ReportError(lResult, prefix.c_str());
}
return returnValue;
}
@ -446,6 +455,7 @@ bool GetVisualStudioDirs(std::string& Path, std::string* WinSDK,
return true;
}
#if (_MSC_VER < 1910)
// Try for any other version we can get
Msg = Verbose ? "highest" : nullptr;
const int Versions[] = { 14, 12, 11, 10, 9, 8, 0 };
@ -455,6 +465,7 @@ bool GetVisualStudioDirs(std::string& Path, std::string* WinSDK,
return true;
}
}
#endif
return false;
}