mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Start PowerToys Run through the ActionRunner (#12043)

Browse Source
This commit is contained in:
Mykhailo Pylyp 2021-07-01 12:26:58 +03:00 committed by GitHub
parent 086394d455
commit b42eb08ec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/utils/elevation.h
View File

@ -307,25 +307,17 @@ inline bool run_non_elevated(const std::wstring& file, const std::wstring& param
inline bool RunNonElevatedEx(const std::wstring& file, const std::wstring& params) inline bool RunNonElevatedEx(const std::wstring& file, const std::wstring& params)
{ {
bool failedToStart = false;
try try
{ {
CoInitialize(nullptr); CoInitialize(nullptr);
if (!ShellExecuteFromExplorer(file.c_str(), params.c_str())) if (!ShellExecuteFromExplorer(file.c_str(), params.c_str()))
{ {
failedToStart = true; return false;
} }
} }
catch(...) catch(...)
{ {
failedToStart = true; return false;
}
if (failedToStart)
{
Logger::warn(L"Failed to delegate process creation. Try a fallback");
DWORD returnPid;
return run_non_elevated(file, params, &returnPid);
} }
return true; return true;

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

@ -243,7 +243,18 @@ public:
} }
else else
{ {
Logger::error(L"Failed to start the process"); Logger::warn(L"RunNonElevatedEx() failed. Trying fallback");
std::wstring action_runner_path = get_module_folderpath() + L"\\PowerToys.ActionRunner.exe";
std::wstring newParams = L"-run-non-elevated -target modules\\launcher\\PowerLauncher.exe " + params;
if (run_non_elevated(action_runner_path, newParams, nullptr))
{
processStarted = true;
Logger::trace("Started PowerToys Run Process");
}
else
{
Logger::warn("Failed to start PowerToys Run");
}
} }
} }
} }