27582a9186
[Defapp] Use real HPCON for PTY management; Have Monarch always listen for connections ## PR Checklist * [x] Closes #9464 * [x] Related to #9475 - incomplete fix * [x] I work here. * [x] Manual test ## Detailed Description of the Pull Request / Additional comments - Sometimes peasants can't manage to accept a connection appropriately because I wrote defterm before @zadjii-msft's monarch/peasant architecture. The simple solution here is to just make the monarch always be listening for inbound connections. Then COM won't start a peasant with -Embedding just to ask the monarch where it should go. It'll just join the active window. I didn't close 9475 because it should follow monarch policies on which window to join... and it doesn't yet. - A lot of interesting things are happening because this didn't have a real HPCON. So I passed through the remaining handles (and re-GUID-ed the interface) that made it possible for me to pack the right process handles and such into an HPCON on the inbound connection and monitor that like any other ConptyConnection. This should resolve some of the process exit behaviors and signal channel things like resizing.
59 lines
1.9 KiB
C
59 lines
1.9 KiB
C
/*++
|
|
Copyright (c) Microsoft Corporation
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
- CTerminalHandoff.h
|
|
|
|
Abstract:
|
|
- This module receives an incoming request to host a terminal UX
|
|
for a console mode application already started and attached to a PTY.
|
|
|
|
Author(s):
|
|
- Michael Niksa (MiNiksa) 31-Aug-2020
|
|
|
|
--*/
|
|
|
|
#pragma once
|
|
|
|
#include "ITerminalHandoff.h"
|
|
|
|
#if defined(WT_BRANDING_RELEASE)
|
|
#define __CLSID_CTerminalHandoff "E12CFF52-A866-4C77-9A90-F570A7AA2C6B"
|
|
#elif defined(WT_BRANDING_PREVIEW)
|
|
#define __CLSID_CTerminalHandoff "86633F1F-6454-40EC-89CE-DA4EBA977EE2"
|
|
#else
|
|
#define __CLSID_CTerminalHandoff "051F34EE-C1FD-4B19-AF75-9BA54648434C"
|
|
#endif
|
|
|
|
using NewHandoffFunction = HRESULT (*)(HANDLE, HANDLE, HANDLE, HANDLE, HANDLE, HANDLE);
|
|
|
|
struct __declspec(uuid(__CLSID_CTerminalHandoff))
|
|
CTerminalHandoff : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITerminalHandoff>
|
|
{
|
|
#pragma region ITerminalHandoff
|
|
STDMETHODIMP EstablishPtyHandoff(HANDLE in,
|
|
HANDLE out,
|
|
HANDLE signal,
|
|
HANDLE ref,
|
|
HANDLE server,
|
|
HANDLE client) noexcept override;
|
|
|
|
#pragma endregion
|
|
|
|
static HRESULT s_StartListening(NewHandoffFunction pfnHandoff) noexcept;
|
|
static HRESULT s_StopListening() noexcept;
|
|
};
|
|
|
|
// Disable warnings from the CoCreatableClass macro as the value it provides for
|
|
// automatic COM class registration is of much greater value than the nits from
|
|
// the static analysis warnings.
|
|
#pragma warning(push)
|
|
|
|
#pragma warning(disable : 26477) // Macro uses 0/NULL over nullptr.
|
|
#pragma warning(disable : 26476) // Macro uses naked union over variant.
|
|
|
|
CoCreatableClass(CTerminalHandoff);
|
|
|
|
#pragma warning(pop)
|