Wire up passing LNK/EXE data from OpenCon to ITerminalHandoff by zadjii-msft · Pull Request #13570 · microsoft/terminal

zadjii-msft · 2022-07-22T18:21:37Z

This PR by itself doesn't really change much. Technically, now the Terminal will respect the Title of a .lnk when started for defterm, but we don't do anything else yet. Primarily, the goal of this PR is to just wire up startup info in OpenConsole to the connected Terminal.

This required a bit of changes in srvinit.cpp:ConsoleEstablishHandoff to replicate other bits of startup, where we crack open the connect message to get the relevant bits of info.
We pack that all into a TERMINAL_STARTUP_INFO, which we pass along to the registered terminal application.
ConptyConnection accepts the handoff, and gathers that information out of the TERMINAL_STARTUP_INFO
Some other updates to the scratch sln were made to make it build again (related, but unimportant).
This is a precursor to:
- Wrong icon gets rendered when directly running apps in terminal (double click exe to open terminal tab). #13111
- Terminal doesn't respect "start /max" and "/min" parameters when running a console app as default terminal #12154
Closes [DefApp] Pass LNK/EXE data from OpenCon to ITerminalHandoff #9458
Tested manually
I work here

…o brboken

…is got so brboken" This reverts commit 103beb4.

This hooks up the defterm interface to pass more info along in the startup. It's notably not the actual link title, but it does work from a plumbing standpoint This is for #9458

…rtupInfoToTerminal

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

src/host/proxy/ITerminalHandoff.idl

…rtupInfoToTerminal

zadjii-msft · 2022-08-11T15:34:08Z

hey look, this made this better:

…caught it

DHowett · 2022-08-12T19:42:16Z

hey look, this made this better

helk yeah

DHowett · 2022-08-12T19:45:41Z

scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj

-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
+  <!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
+  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />


this project becomes less sampley every day!

src/cascadia/CascadiaPackage/Package.appxmanifest

src/cascadia/TerminalConnection/ConptyConnection.cpp

src/cascadia/TerminalConnection/ConptyConnection.h

src/host/proxy/ITerminalHandoff.idl

…alHandoff

zadjii-msft · 2022-08-24T15:28:45Z

Yo @DHowett I did run this with appverifier and this ran clean 😄

DHowett

perfect

DHowett · 2022-08-25T23:01:49Z

@msftbot make sure @DHowett-MSFT signs off

DHowett · 2022-08-25T23:02:18Z

This will never be true. It will not clear this status, so you'll have to manually merge it. :)

ghost · 2022-09-13T17:05:50Z

🎉Windows Terminal Preview v1.16.252 has been released which incorporates this pull request.:tada:

Handy links:

This PR by itself doesn't _really_ change much. Technically, now the Terminal will respect the Title of a `.lnk` when started for defterm, but we don't do anything else yet. Primarily, the goal of this PR is to just wire up startup info in OpenConsole to the connected Terminal. * This required a bit of changes in `srvinit.cpp:ConsoleEstablishHandoff` to replicate other bits of startup, where we crack open the connect message to get the relevant bits of info. * We pack that all into a `TERMINAL_STARTUP_INFO`, which we pass along to the registered terminal application. * `ConptyConnection` accepts the handoff, and gathers that information out of the `TERMINAL_STARTUP_INFO` * Some other updates to the scratch sln were made to make it build again (related, but unimportant). * This is a precursor to: * #13111 * #12154 * Closes #9458 * Tested manually * I work here (cherry picked from commit 7e47f6a) Service-Card-Id: 86230565 Service-Version: 1.15

These were wrong.

These were wrong. (cherry picked from commit 1f19ed0) Service-Card-Id: 86230901 Service-Version: 1.16

ghost · 2022-10-18T21:51:25Z

🎉Windows Terminal v1.15.2874 has been released which incorporates this pull request.:tada:

Handy links:

zadjii-msft added 13 commits July 18, 2022 14:59

I just want to run the scratch project, I have no idea how this got s…

103beb4

…o brboken

Revert "I just want to run the scratch project, I have no idea how th…

c795793

…is got so brboken" This reverts commit 103beb4.

A BLANK SCRATCH COMMIT

11bfc73

prototype

1dd6e99

Good-news-everyone.gif

874a15b

This hooks up the defterm interface to pass more info along in the startup. It's notably not the actual link title, but it does work from a plumbing standpoint This is for #9458

this does temporarily get the title out of the link, but then it's lose

dc78b32

Cleanup, comments, etc.

9a2ee6a

I think this is all the prototyping I need

fd75c5e

Merge remote-tracking branch 'origin/main' into dev/migrie/f/9458-sta…

4b717db

…rtupInfoToTerminal

Merge remote-tracking branch 'origin/main' into dev/migrie/f/9458-sta…

c0b4840

…rtupInfoToTerminal

Remove scratch work

7268e96

cleanup for review

e333661

more comments, cleanup

879a955

ghost added Area-DefApp Area-Server Down in the muck of API call servicing, interprocess communication, eventing, etc. Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels Jul 22, 2022

This comment has been minimized.

Sign in to view

DHowett reviewed Jul 22, 2022

View reviewed changes

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest Outdated Show resolved Hide resolved

DHowett reviewed Jul 22, 2022

View reviewed changes

src/host/proxy/ITerminalHandoff.idl Outdated Show resolved Hide resolved

zadjii-msft added 4 commits July 26, 2022 10:29

had this all before the long weekend

5bf3c1e

Merge remote-tracking branch 'origin/main' into dev/migrie/f/9458-sta…

01420b9

…rtupInfoToTerminal

I think I'm gonna need to put EVERYTHING in here

18a62bd

Merge remote-tracking branch 'origin/main' into dev/migrie/f/9458-sta…

d2336e3

…rtupInfoToTerminal

big s/o to whoever added the onecore projects to the oss repo, so we …

3ce349e

…caught it

DHowett requested changes Aug 12, 2022

View reviewed changes

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Aug 12, 2022

Merge branch 'main' into dev/migrie/f/9458-startupInfoToTerminal

5849279

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Aug 19, 2022

Code review notes

38de95e

zadjii-msft mentioned this pull request Aug 22, 2022

Revert the revert of "Hide the window until we're finished with initialization" #13811

Merged

zadjii-msft added the Automerge-Not-Compatible label Aug 22, 2022

DHowett added a commit that referenced this pull request Aug 23, 2022

PRE-MERGE #13570 Wire up passing LNK/EXE data from OpenCon to ITermin…

a4ae037

…alHandoff

zadjii-msft assigned DHowett Aug 24, 2022

zadjii-msft mentioned this pull request Aug 24, 2022

Respect the startup info state initially passed to wt via ShellExecute #13838

Merged

DHowett added the Needs-Second It's a PR that needs another sign-off label Aug 25, 2022

ghost requested review from PankajBhojwani and carlos-zamora August 25, 2022 22:58

DHowett approved these changes Aug 25, 2022

View reviewed changes

ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Aug 25, 2022

microsoft deleted a comment Aug 25, 2022

zadjii-msft merged commit 7e47f6a into main Aug 26, 2022

AveYo mentioned this pull request Sep 2, 2022

conhost headless mode is broken #13914

Closed

ghost mentioned this pull request Sep 13, 2022

[DefApp] Pass LNK/EXE data from OpenCon to ITerminalHandoff #9458

Closed

DHowett added a commit that referenced this pull request Oct 14, 2022

Fix the Release build ProxyStubClsids from #13570

abfaa5d

DHowett added a commit that referenced this pull request Oct 14, 2022

Fix the Release build ProxyStubClsids from #13570

ef29056

ghost pushed a commit that referenced this pull request Oct 15, 2022

Fix the Release build ProxyStubClsids from #13570 (#14225)

1f19ed0

These were wrong.

DHowett added a commit that referenced this pull request Oct 17, 2022

Fix the Release build ProxyStubClsids from #13570 (#14225)

0dccbac

These were wrong. (cherry picked from commit 1f19ed0) Service-Card-Id: 86230901 Service-Version: 1.16

Conversation

zadjii-msft commented Jul 22, 2022

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

zadjii-msft commented Aug 11, 2022

Uh oh!

DHowett commented Aug 12, 2022

Uh oh!

DHowett Aug 12, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zadjii-msft commented Aug 24, 2022

Uh oh!

DHowett left a comment

Choose a reason for hiding this comment

Uh oh!

DHowett commented Aug 25, 2022

Uh oh!

DHowett commented Aug 25, 2022

Uh oh!

ghost commented Sep 13, 2022

Uh oh!

ghost commented Oct 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants