Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[KBM]Expand environment variables in program arguments (#32427)

Browse Source
This commit is contained in:
HydroH
2024-04-23 04:43:43 +08:00
committed by GitHub
parent a89f9f6976
commit 88b709bef3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardEventHandlers.cpp
View File

@@ -1387,11 +1387,14 @@ namespace KeyboardEventHandlers
return; return;
} }
std::wstring executable_and_args = fmt::format(L"\"{}\" {}", fullExpandedFilePath, shortcut.runProgramArgs); std::wstring expandedArgs;
DWORD dwSize = ExpandEnvironmentStrings(shortcut.runProgramArgs.c_str(), nullptr, 0);
expandedArgs.resize(dwSize);
DWORD result = ExpandEnvironmentStrings(shortcut.runProgramArgs.c_str(), expandedArgs.data(), dwSize);
WCHAR currentDir[MAX_PATH]; WCHAR currentDir[MAX_PATH];
WCHAR* currentDirPtr = currentDir; WCHAR* currentDirPtr = currentDir;
DWORD result = ExpandEnvironmentStrings(shortcut.runProgramStartInDir.c_str(), currentDir, MAX_PATH); result = ExpandEnvironmentStrings(shortcut.runProgramStartInDir.c_str(), currentDir, MAX_PATH);
if (shortcut.runProgramStartInDir == L"") if (shortcut.runProgramStartInDir == L"")
{ {
@@ -1416,16 +1419,16 @@ namespace KeyboardEventHandlers
if (shortcut.elevationLevel == Shortcut::ElevationLevel::Elevated) if (shortcut.elevationLevel == Shortcut::ElevationLevel::Elevated)
{ {
newProcessHandle = run_elevated(fullExpandedFilePath, shortcut.runProgramArgs, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal)); newProcessHandle = run_elevated(fullExpandedFilePath, expandedArgs, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal));
processId = GetProcessId(newProcessHandle); processId = GetProcessId(newProcessHandle);
} }
else if (shortcut.elevationLevel == Shortcut::ElevationLevel::NonElevated) else if (shortcut.elevationLevel == Shortcut::ElevationLevel::NonElevated)
{ {
run_non_elevated(fullExpandedFilePath, shortcut.runProgramArgs, &processId, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal)); run_non_elevated(fullExpandedFilePath, expandedArgs, &processId, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal));
} }
else if (shortcut.elevationLevel == Shortcut::ElevationLevel::DifferentUser) else if (shortcut.elevationLevel == Shortcut::ElevationLevel::DifferentUser)
{ {
newProcessHandle = run_as_different_user(fullExpandedFilePath, shortcut.runProgramArgs, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal)); newProcessHandle = run_as_different_user(fullExpandedFilePath, expandedArgs, currentDirPtr, (shortcut.startWindowType == Shortcut::StartWindowType::Normal));
processId = GetProcessId(newProcessHandle); processId = GetProcessId(newProcessHandle);
} }