Relaunch MO as admin when elevation is required

Previously, a new process of MO would be created as administrator when elevation was required.  This had some unwanted side effects.  The GUI lock would not function.  The virtual file system would likely break as the non-admin process could not access data from the new admin instance.

1 files changed, 19 insertions, 11 deletions

diff --git a/src/spawn.cpp b/src/spawn.cpp
index 6bb34aea..1459aadb 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -26,6 +26,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <Shellapi.h>

 #include <appconfig.h>

 #include <windows_error.h>

+#include "helper.h"

 

 #include <QApplication>

 #include <QMessageBox>

@@ -148,24 +149,31 @@ HANDLE startBinary(const QFileInfo &binary,
     }

   } catch (const windows_error &e) {

     if (e.getErrorCode() == ERROR_ELEVATION_REQUIRED) {

-      // TODO: check if this is really correct. Are all settings updated that the secondary instance may use?

-

-      if (QMessageBox::question(nullptr, QObject::tr("Elevation required"),

+      if (QMessageBox::question(QApplication::activeModalWidget(), QObject::tr("Elevation required"),

                                 QObject::tr("This process requires elevation to run.\n"

                                     "This is a potential security risk so I highly advice you to investigate if\n"

                                     "\"%1\"\n"

                                     "can be installed to work without elevation.\n\n"

-                                    "Start elevated anyway? "

-                                    "(you will be asked if you want to allow ModOrganizer.exe to make changes to the system)").arg(

+                                    "Restart Mod Organizer as an elevated process?\n"

+                                    "You will be asked if you want to allow helper.exe to make changes to the system."

+                                    "You will need to relaunch the process above manually.").arg(

                                         QDir::toNativeSeparators(binary.absoluteFilePath())),

                                 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

-        std::wstring parameters = ToWString("\"" + QDir::toNativeSeparators(binary.absoluteFilePath()) + "\" " + QString(arguments).replace("\"", "\\\""));

-        ::ShellExecuteW(nullptr, L"runas", ToWString(QCoreApplication::applicationFilePath()).c_str(),

-                        parameters.c_str(), currentDirectoryName.c_str(), SW_SHOWNORMAL);

-        return INVALID_HANDLE_VALUE;

-      } else {

-        return INVALID_HANDLE_VALUE;

+        WCHAR cwd[MAX_PATH];

+        if (!GetCurrentDirectory(MAX_PATH, cwd)) {

+          reportError(QObject::tr("failed to spawn \"%1\": %2").arg(binary.fileName()).arg(::GetLastError()));

+          cwd[0] = L'\0';

+        }

+        if (!Helper::adminLaunch(

+              qApp->applicationDirPath().toStdWString(),

+              qApp->applicationFilePath().toStdWString(),

+              std::wstring(cwd))) {

+          return INVALID_HANDLE_VALUE;

+        }

+        qApp->exit(0);

       }

+      return INVALID_HANDLE_VALUE;

+

     } else {

       reportError(QObject::tr("failed to spawn \"%1\": %2").arg(binary.fileName()).arg(e.what()));

       return INVALID_HANDLE_VALUE;