mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-03 07:55:10 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

[runner, color picker, run] remove os dection (#10648)

Browse Source
This commit is contained in:
Enrico Giordani
2021-04-08 07:10:05 -07:00
committed by GitHub
parent 97fdf10cea
commit aa5ff65b54
3 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/colorPicker/ColorPicker/dllmain.cpp
View File

@@ -6,7 +6,6 @@
#include "Generated Files/resource.h" #include "Generated Files/resource.h"
#include <common/logger/logger.h> #include <common/logger/logger.h>
#include <common/SettingsAPI/settings_objects.h> #include <common/SettingsAPI/settings_objects.h>
#include <common/utils/os-detect.h>
#include <common/utils/resources.h> #include <common/utils/resources.h>
#include <colorPicker/ColorPicker/ColorPickerConstants.h> #include <colorPicker/ColorPicker/ColorPickerConstants.h>
@@ -227,12 +226,8 @@ public:
{ {
ResetEvent(send_telemetry_event); ResetEvent(send_telemetry_event);
ResetEvent(m_hInvokeEvent); ResetEvent(m_hInvokeEvent);
// use only with new settings?
if (UseNewSettings())
{
launch_process(); launch_process();
m_enabled = true; m_enabled = true;
}
}; };
virtual void disable() virtual void disable()

6
src/modules/launcher/Microsoft.Launcher/dllmain.cpp
View File

@@ -11,7 +11,6 @@
#include <common/utils/elevation.h> #include <common/utils/elevation.h>
#include <common/utils/process_path.h> #include <common/utils/process_path.h>
#include <common/utils/resources.h> #include <common/utils/resources.h>
#include <common/utils/os-detect.h>
#include <common/utils/winapi_error.h> #include <common/utils/winapi_error.h>
#include <filesystem> #include <filesystem>
@@ -185,9 +184,7 @@ public:
Logger::info("Launcher is enabling"); Logger::info("Launcher is enabling");
ResetEvent(m_hEvent); ResetEvent(m_hEvent);
ResetEvent(send_telemetry_event); ResetEvent(send_telemetry_event);
// Start PowerLauncher.exe only if the OS is 19H1 or higher
if (UseNewSettings())
{
unsigned long powertoys_pid = GetCurrentProcessId(); unsigned long powertoys_pid = GetCurrentProcessId();
if (!is_process_elevated(false)) if (!is_process_elevated(false))
@@ -269,7 +266,6 @@ public:
CloseHandle(hMapFile); CloseHandle(hMapFile);
} }
} }
}
// Disable the powertoy // Disable the powertoy
virtual void disable() virtual void disable()

9
src/runner/settings_window.cpp
View File

@@ -20,7 +20,6 @@
#include <common/version/helper.h> #include <common/version/helper.h>
#include <common/logger/logger.h> #include <common/logger/logger.h>
#include <common/utils/elevation.h> #include <common/utils/elevation.h>
#include <common/utils/os-detect.h>
#include <common/utils/process_path.h> #include <common/utils/process_path.h>
#include <common/utils/timeutil.h> #include <common/utils/timeutil.h>
#include <common/utils/winapi_error.h> #include <common/utils/winapi_error.h>
@@ -367,12 +366,12 @@ void run_settings_window(bool showOobeWindow)
BOOL process_created = false; BOOL process_created = false;
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 // Due to a bug in .NET, running the Settings process as non-elevated
// from an elevated process sometimes results in a crash. // from an elevated process sometimes results in a crash.
// TODO: Revisit this after switching to .NET 5 // process_created = run_settings_non_elevated(executable_path.c_str(), executable_args.data(), &process_info);
if (is_process_elevated() && !UseNewSettings())
{
process_created = run_settings_non_elevated(executable_path.c_str(), executable_args.data(), &process_info);
} }
if (FALSE == process_created) if (FALSE == process_created)