Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 03:22:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix uninstall keys

Browse source
This commit is contained in:
danteruiz 2019-10-16 14:56:05 -07:00
parent 7474f3f721
commit baf651ccd5
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launchers/qt/src/Helper_windows.cpp
View file

@ -161,7 +161,7 @@ BOOL isProcessRunning(const char* processName, int& processID) {
entry.dwSize = sizeof(PROCESSENTRY32);
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
if (Process32First(snapshot, &entry)) {
while (Process32Next(snapshot, &entry)) {
if (!_stricmp(entry.szExeFile, processName)) {

43
launchers/qt/src/LauncherInstaller_windows.cpp
View file

@ -51,7 +51,7 @@ void LauncherInstaller::install() {
deleteShortcuts();
createShortcuts();
deleteApplicationRegistryKeys();
createApplicationRegistryKeys();
} else {
qDebug() << "Failed to install HQ Launcher";
@ -83,17 +83,31 @@ void LauncherInstaller::createShortcuts() {
(LPCSTR)("Click to Setup and Launch HQ"));
}
QString randomQtString() {
const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
const int randomStringLength = 5;
auto now = std::chrono::system_clock::now();
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch());
qsrand(duration.count());
QString randomString;
for(int i = 0; i < randomStringLength; i++)
{
int index = qrand() % possibleCharacters.length();
QChar nextChar = possibleCharacters.at(index);
randomString.append(nextChar);
}
return randomString;
}
void LauncherInstaller::uninstall() {
qDebug() << "Uninstall Launcher";
deleteShortcuts();
CommandlineOptions* options = CommandlineOptions::getInstance();
if (!options->contains("--resumeUninstall")) {
QDir tmpDirectory = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
QString destination = tmpDirectory.absolutePath() + "/HQ Launcher.exe";
qDebug() << destination;
if (QFile::exists(destination)) {
QFile::remove(destination);
}
QString destination = tmpDirectory.absolutePath() + "/" + randomQtString() + ".exe";
qDebug() << "temp file destination: " << destination;
bool copied = QFile::copy(_launcherRunningFilePath, destination);
if (copied) {
@ -193,12 +207,14 @@ void LauncherInstaller::uninstallOldLauncher() {
void LauncherInstaller::createApplicationRegistryKeys() {
const std::string REGISTRY_PATH = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\HQ";
bool success = insertRegistryKey(REGISTRY_PATH, "DisplayName", "HQ");
std::string installPath = _launcherInstallDir.absolutePath().toStdString();
std::string installPath = _launcherInstallDir.absolutePath().replace("/", "\\").toStdString();
success = insertRegistryKey(REGISTRY_PATH, "InstallLocation", installPath);
std::string applicationExe = installPath + "/HQ Launcher.exe";
std::string uninstallPath = '"' + applicationExe + '"' + " --uninstall";
std::string applicationExe = installPath + "\\HQ Launcher.exe";
std::string uninstallPath = applicationExe + " --uninstall";
qDebug() << QString::fromStdString(applicationExe);
qDebug() << QString::fromStdString(uninstallPath);
success = insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", "DEV");
success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", std::string(LAUNCHER_BUILD_VERSION));
success = insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
success = insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity");
@ -207,7 +223,7 @@ void LauncherInstaller::createApplicationRegistryKeys() {
std::stringstream date;
date << std::put_time(std::localtime(&now), "%Y-%m-%d") ;
success = insertRegistryKey(REGISTRY_PATH, "InstallDate", date.str());
//success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size);
success = insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)14181);
success = insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1);
success = insertRegistryKey(REGISTRY_PATH, "NoRepair", (DWORD)1);
@ -216,7 +232,6 @@ void LauncherInstaller::createApplicationRegistryKeys() {
void LauncherInstaller::deleteApplicationRegistryKeys() {
const std::string regPath= "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\HQ";
if (!deleteRegistryKey(regPath.c_str())) {
qDebug() << "Failed to delete registryKeys";
}
bool success = deleteRegistryKey(regPath.c_str());
qDebug() << "Did delete Application Registry Keys: " << success;
}