7612044363
## Summary of the Pull Request This PR implements a pair of shims for `cmd` and `powershell`, so that their `cls` and `Clear-Host` functions will clear the entire terminal buffer (like they do in conhost), instead of just the viewport. With the conpty viewport and buffer being the same size, there's effectively no way to know if an application is calling these API's in this way with the intention of clearing the buffer or the viewport. We absolutely have to guess. Each of these shims checks to see if the way that the API is being called exactly matches the way `cmd` or `powershell` would call these APIs. If it does, we manually write a `^[[3J` to the connected terminal, to get he Terminal to clear it's own scrollback. ~~_⚠️ If another application were trying to clear the **viewport** with an exactly similar API call, this would also cause the terminal scrollback to get cleared ⚠️_~~ * [x] Should these shims be restricted to when the process that's calling them is actually `cmd.exe` or `powershell.exe`? Can I even do this? I think we've done such a good job of isolating the client process information from the rest of the host code that I can't figure out how to do this. - YES, this can be done, and I did it. * [ ] **TODO**: _While I'm here_, should I have `DoSrvPrivateEraseAll` (the implementation for `^[[2J`, in `getset.cpp`) also manually trigger a EraseAll in the terminal in conpty mode? ## PR Checklist * [x] Closes #3126 * [x] Actually closes #1305 too, which is really the same thing, but probably deserves a callout * [x] I work here * [x] Tests added/passed * [n/a] Requires documentation to be updated ## Validation Steps Performed * ran tests * checked `cls` in the Terminal * checked `Clear-Host` in the Terminal * Checked running `powershell clear-host` from `cmd.exe`
64 lines
1.7 KiB
C++
64 lines
1.7 KiB
C++
/*++
|
|
Copyright (c) Microsoft Corporation
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
- ProcessHandle.h
|
|
|
|
Abstract:
|
|
- This file defines the handles that were given to a particular client process ID when it connected.
|
|
|
|
Author:
|
|
- Michael Niksa (miniksa) 12-Oct-2016
|
|
|
|
Revision History:
|
|
- Adapted from original items in handle.h
|
|
--*/
|
|
|
|
#pragma once
|
|
|
|
#include "ObjectHandle.h"
|
|
#include "WaitQueue.h"
|
|
#include "ProcessPolicy.h"
|
|
#include "ConsoleShimPolicy.h"
|
|
|
|
#include <memory>
|
|
#include <wil\resource.h>
|
|
|
|
class ConsoleProcessHandle
|
|
{
|
|
public:
|
|
std::unique_ptr<ConsoleWaitQueue> const pWaitBlockQueue;
|
|
std::unique_ptr<ConsoleHandleData> pInputHandle;
|
|
std::unique_ptr<ConsoleHandleData> pOutputHandle;
|
|
|
|
bool fRootProcess;
|
|
|
|
DWORD const dwProcessId;
|
|
DWORD const dwThreadId;
|
|
|
|
const ConsoleProcessPolicy GetPolicy() const;
|
|
const ConsoleShimPolicy GetShimPolicy() const;
|
|
|
|
CD_CONNECTION_INFORMATION GetConnectionInformation() const;
|
|
|
|
private:
|
|
ConsoleProcessHandle(const DWORD dwProcessId,
|
|
const DWORD dwThreadId,
|
|
const ULONG ulProcessGroupId);
|
|
~ConsoleProcessHandle() = default;
|
|
ConsoleProcessHandle(const ConsoleProcessHandle&) = delete;
|
|
ConsoleProcessHandle(ConsoleProcessHandle&&) = delete;
|
|
ConsoleProcessHandle& operator=(const ConsoleProcessHandle&) & = delete;
|
|
ConsoleProcessHandle& operator=(ConsoleProcessHandle&&) & = delete;
|
|
|
|
ULONG _ulTerminateCount;
|
|
ULONG const _ulProcessGroupId;
|
|
wil::unique_handle const _hProcess;
|
|
|
|
const ConsoleProcessPolicy _policy;
|
|
const ConsoleShimPolicy _shimPolicy;
|
|
|
|
friend class ConsoleProcessList; // ensure List manages lifetimes and not other classes.
|
|
};
|