[settings-ui] Settings WinUI3 (#17797)

* Add Settings.WinUI3 project * New namespace * Activation and Services * Assets and Behaviors * Converters and Helpers * Controls * View and ViewModels * Styles and Themes * OOBE * Strings * Small App moves * [check] Project files - publish profiles and launchSettings.json * [using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name workaround * [WIP] Workarounds to make it work * Fix suppressed warnings - naming * Add code analysis * Fix KBMPage and App dispatcher Fix MessageBox - replace with MessageDialog * Fix ImageResizerPage & mark ColorPickerButton with TODO * Add icon to windows Cleanup MainWindow.xaml.cs and OobeWindow.xaml.cs MainWindows and OobeWindow management * App Icon No framework and runtime subdirs * Remove PowerToys.Settings and Settings.UI from solution Update output paths * Installer work & publish.cmd * Fix dispatcher crashes * Fix crashes * Add all dlls to installer Cleanup installer Add OpenOOBE and OpenScoobe logic Fix minor issues Fix update scenario - REINSTALLMODE * Rename back namespaces, project name and project dir * [wip] move to winappsdk 1.1 * Fix propagating isElevated & installer runtimes dlls * Remove obsolete dir/file * PowerToys.Interop to netstandard2.0 * Move everything to .Net6 * [Settings] Always launch settings process non-elevated (#17791) * Move back to WinAppSdk 1.0.1 * Add Settings.WinUI3 project * New namespace * Activation and Services * Assets and Behaviors * Converters and Helpers * Controls * View and ViewModels * Styles and Themes * OOBE * Strings * Small App moves * [check] Project files - publish profiles and launchSettings.json * [using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name workaround * [WIP] Workarounds to make it work * Fix suppressed warnings - naming * Add code analysis * Fix KBMPage and App dispatcher Fix MessageBox - replace with MessageDialog * Fix ImageResizerPage & mark ColorPickerButton with TODO * Add icon to windows Cleanup MainWindow.xaml.cs and OobeWindow.xaml.cs MainWindows and OobeWindow management * App Icon No framework and runtime subdirs * Remove PowerToys.Settings and Settings.UI from solution Update output paths * Installer work & publish.cmd * Fix dispatcher crashes * Fix crashes * Add all dlls to installer Cleanup installer Add OpenOOBE and OpenScoobe logic Fix minor issues Fix update scenario - REINSTALLMODE * Rename back namespaces, project name and project dir * [wip] move to winappsdk 1.1 * Fix propagating isElevated & installer runtimes dlls * Remove obsolete dir/file * PowerToys.Interop to netstandard2.0 * Move everything to .Net6 * [Settings] Always launch settings process non-elevated (#17791) * Move back to WinAppSdk 1.0.1 * Revert merge conflict ARM64 removal * Fix KBM Browse overlay image button * Bring back settings publish profile * Update release.yml * Change target frameworkd windows version * [Setup] Add Windows Application Runtime SDK (#17809) * Update requirements doc * Update compiling docs * Fix signing * Fix Settings exe and dll versions * Add exception for dlls that have version 1.0.0.0 * Fix powershell condition Co-authored-by: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com>
2025-09-01 06:55:17 +00:00 · 2022-04-19 22:00:28 +02:00
parent 42afc4f4fc
commit 27c4b1be0e
160 changed files with 1179 additions and 2120 deletions
--- a/src/runner/settings_window.cpp
+++ b/src/runner/settings_window.cpp
@@ -334,24 +334,16 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
    // 1. Run on start up.
    PTSettingsHelper::save_general_settings(save_settings.to_json());

-    std::wstring executable_args = L"\"";
-    executable_args.append(executable_path);
-    executable_args.append(L"\" ");
-    executable_args.append(powertoys_pipe_name);
-    executable_args.append(L" ");
-    executable_args.append(settings_pipe_name);
-    executable_args.append(L" ");
-    executable_args.append(std::to_wstring(powertoys_pid));
-    executable_args.append(L" ");
-    executable_args.append(settings_theme);
-    executable_args.append(L" ");
-    executable_args.append(settings_elevatedStatus);
-    executable_args.append(L" ");
-    executable_args.append(settings_isUserAnAdmin);
-    executable_args.append(L" ");
-    executable_args.append(settings_showOobe);
-    executable_args.append(L" ");
-    executable_args.append(settings_showScoobe);
+    std::wstring executable_args = fmt::format(L"\"{}\" {} {} {} {} {} {} {} {}",
+                                               executable_path,
+                                               powertoys_pipe_name,
+                                               settings_pipe_name,
+                                               std::to_wstring(powertoys_pid),
+                                               settings_theme,
+                                               settings_elevatedStatus,
+                                               settings_isUserAnAdmin,
+                                               settings_showOobe,
+                                               settings_showScoobe);

    if (settings_window.has_value())
    {
@@ -363,10 +355,14 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op

    if (is_process_elevated())
    {
-        // TODO: Revisit this after switching to .NET 5
-        // Due to a bug in .NET, running the Settings process as non-elevated
-        // from an elevated process sometimes results in a crash.
-        // process_created = run_settings_non_elevated(executable_path.c_str(), executable_args.data(), &process_info);
+        auto res = RunNonElevatedFailsafe(executable_path, executable_args, get_module_folderpath());
+        process_created = res.has_value();
+        if (process_created)
+        {
+            process_info.dwProcessId = res->processID;
+            process_info.hProcess = res->processHandle.release();
+            g_isLaunchInProgress = false;
+        }
    }

    if (FALSE == process_created)