Fallback to run as admin, if running PT as user not possible

microsoft · Feb 4, 2022 · 6b6edf5 · 6b6edf5
1 parent f62dd69
commit 6b6edf5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/runner/main.cpp b/src/runner/main.cpp
@@ -386,15 +386,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
         apply_general_settings(general_settings, false);
         int rvalue = 0;
         const bool elevated = is_process_elevated();
+        const bool withDontElevateArg = cmdLine.find("--dont-elevate") != std::string::npos;
+        const bool runElevatedSetting = general_settings.GetNamedBoolean(L"run_elevated", false);
 
-        if (elevated && cmdLine.find("--dont-elevate") != std::string::npos &&
-            general_settings.GetNamedBoolean(L"run_elevated", false) == false) {
+        if (elevated && withDontElevateArg && runElevatedSetting == false)
+        {
             schedule_restart_as_non_elevated();
             result = 0;
         }
-        else if ((elevated ||
-             general_settings.GetNamedBoolean(L"run_elevated", false) == false ||
-             cmdLine.find("--dont-elevate") != std::string::npos))
+        else if (elevated || runElevatedSetting == false || withDontElevateArg)
         {
             result = runner(elevated, open_settings, settings_window, openOobe);
 
@@ -425,12 +425,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
     {
         if (restart_if_scheduled() == false)
         {
-            auto text = is_process_elevated() ? GET_RESOURCE_STRING(IDS_COULDNOT_RESTART_NONELEVATED) :
-                                                GET_RESOURCE_STRING(IDS_COULDNOT_RESTART_ELEVATED);
-            MessageBoxW(nullptr, text.c_str(), GET_RESOURCE_STRING(IDS_ERROR).c_str(), MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-
-            restart_same_elevation();
-            result = -1;
+            Logger::warn("Scheduled restart failed. Trying restart as admin as fallback...");
+            restart_elevated();
         }
     }
     stop_tray_icon();

diff --git a/src/runner/restart_elevated.cpp b/src/runner/restart_elevated.cpp
@@ -47,10 +47,10 @@ bool restart_if_scheduled()
     }
 }
 
-bool restart_same_elevation()
+bool restart_elevated()
 {
     constexpr DWORD exe_path_size = 0xFFFF;
     auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
     GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
-    return run_same_elevation(exe_path.get(), L"--dont-elevate", nullptr);
+    return run_same_elevation(exe_path.get(), L"", nullptr);
 }
diff --git a/src/runner/restart_elevated.h b/src/runner/restart_elevated.h
@@ -3,4 +3,4 @@ void schedule_restart_as_elevated(bool openSettings);
 void schedule_restart_as_non_elevated();
 bool is_restart_scheduled();
 bool restart_if_scheduled();
-bool restart_same_elevation();
+bool restart_elevated();