-
Notifications
You must be signed in to change notification settings - Fork 8.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build and ship an actual binary named wt that just launches WT (#6860)
Due to a shell limitation, Ctrl+Shift+Enter will not launch Windows Terminal as Administrator. This is caused by the app execution alias and the actual targeted executable not having the same name. In addition, PowerShell has an issue detecting app execution aliases as GUI/TUI applications. When you run wt from PowerShell, the shell will wait for WT to exit before returning to the prompt. Having a shim that immediately re-executes WindowsTerminal and then returns handily knocks this issue out (as the process that PS was waiting for exits immediately.) This could cause a regression for anybody who tries to capture the PID of wt.exe. Our process tree is not an API, and we have offered no consistency guarantee on it. VALIDATION ---------- Tested manual launch in a number of different scenarios: * [x] start menu "wtd" * [x] start menu tile * [x] powertoys run * [x] powertoys run ctrl+shift (admin) * [x] powershell inbox, "core" * [x] cmd * [x] run dialog * [x] run dialog ctrl+shift (admin) * [x] run from a lnk with window mode=maximized Fixes #4645 (PowerShell waits for wt) Fixes #6625 (Can't launch as admin using C-S-enter)
- Loading branch information
Showing
10 changed files
with
200 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| //{{NO_DEPENDENCIES}} | ||
| // Microsoft Visual C++ generated include file. | ||
| // Used by wt.rc | ||
| // | ||
| #define IDI_APPICON 101 | ||
|
|
||
| // Next default values for new objects | ||
| // | ||
| #ifdef APSTUDIO_INVOKED | ||
| #ifndef APSTUDIO_READONLY_SYMBOLS | ||
| #define _APS_NEXT_RESOURCE_VALUE 102 | ||
| #define _APS_NEXT_COMMAND_VALUE 40001 | ||
| #define _APS_NEXT_CONTROL_VALUE 1001 | ||
| #define _APS_NEXT_SYMED_VALUE 101 | ||
| #endif | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| #include <string> | ||
| #include <filesystem> | ||
|
|
||
| #define WIN32_LEAN_AND_MEAN | ||
| #include <windows.h> | ||
| #include <wil/stl.h> | ||
| #include <wil/resource.h> | ||
| #include <wil/win32_helpers.h> | ||
|
|
||
| #pragma warning(suppress : 26461) // we can't change the signature of wWinMain | ||
| int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR pCmdLine, int) | ||
| { | ||
| std::filesystem::path module{ wil::GetModuleFileNameW<std::wstring>(nullptr) }; | ||
|
|
||
| // Cache our name (wt, wtd) | ||
| std::wstring ourFilename{ module.filename() }; | ||
|
|
||
| // Swap wt[d].exe for WindowsTerminal.exe | ||
| module.replace_filename(L"WindowsTerminal.exe"); | ||
|
|
||
| // Append the rest of the commandline to the saved name | ||
| std::wstring cmdline; | ||
| if (FAILED(wil::str_printf_nothrow(cmdline, L"%s %s", ourFilename.c_str(), pCmdLine))) | ||
| { | ||
| return 1; | ||
| } | ||
|
|
||
| // Get our startup info so it can be forwarded | ||
| STARTUPINFOW si{}; | ||
| si.cb = sizeof(si); | ||
| GetStartupInfoW(&si); | ||
|
|
||
| // Go! | ||
| wil::unique_process_information pi; | ||
| return !CreateProcessW(module.c_str(), cmdline.data(), nullptr, nullptr, FALSE, 0, nullptr, nullptr, &si, &pi); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // Microsoft Visual C++ generated resource script. | ||
| // | ||
| #include "resource.h" | ||
|
|
||
| #define APSTUDIO_READONLY_SYMBOLS | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Generated from the TEXTINCLUDE 2 resource. | ||
| // | ||
| #include "winres.h" | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| #undef APSTUDIO_READONLY_SYMBOLS | ||
|
|
||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // English (United States) resources | ||
|
|
||
| #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) | ||
| LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US | ||
| #pragma code_page(1252) | ||
|
|
||
| #ifdef APSTUDIO_INVOKED | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // TEXTINCLUDE | ||
| // | ||
|
|
||
| 1 TEXTINCLUDE | ||
| BEGIN | ||
| "resource.h\0" | ||
| END | ||
|
|
||
| 2 TEXTINCLUDE | ||
| BEGIN | ||
| "#include ""winres.h""\0" | ||
| END | ||
|
|
||
| 3 TEXTINCLUDE | ||
| BEGIN | ||
| "\r\n" | ||
| "\0" | ||
| END | ||
|
|
||
| #endif // APSTUDIO_INVOKED | ||
|
|
||
|
|
||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Icon | ||
| // | ||
|
|
||
| // Icon with lowest ID value placed first to ensure application icon | ||
| // remains consistent on all systems. | ||
| IDI_APPICON ICON "..\\..\\..\\res\\terminal.ico" | ||
|
|
||
| #endif // English (United States) resources | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
|
|
||
|
|
||
|
|
||
| #ifndef APSTUDIO_INVOKED | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Generated from the TEXTINCLUDE 3 resource. | ||
| // | ||
|
|
||
|
|
||
| ///////////////////////////////////////////////////////////////////////////// | ||
| #endif // not APSTUDIO_INVOKED | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{506fd703-baa7-4f6e-9361-64f550ec8fca}</ProjectGuid> | ||
| <Keyword>Win32Proj</Keyword> | ||
| <RootNamespace>wt</RootNamespace> | ||
| <ProjectName>wt</ProjectName> | ||
| <TargetName>wt</TargetName> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> | ||
| <Import Project="$(OpenConsoleDir)src\common.build.pre.props" /> | ||
|
|
||
| <!-- Source Files --> | ||
| <ItemGroup> | ||
| <ClCompile Include="shim.cpp"> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| </ClCompile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ResourceCompile Include="wt.rc" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="$(OpenConsoleDir)src\common.build.post.props" /> | ||
|
|
||
| <ItemDefinitionGroup> | ||
| <Link> | ||
| <!-- Remove all non-onecore dependencies --> | ||
| <AdditionalDependencies>onecore.lib</AdditionalDependencies> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| </Project> | ||
|
|