this worked

microsoft · Jun 8, 2022 · e970f7c · e970f7c
1 parent f117fb8
commit e970f7c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/src/inc/HostSignals.hpp b/src/inc/HostSignals.hpp
@@ -19,7 +19,7 @@ namespace Microsoft::Console
     struct HostSignalSetForegroundData
     {
         uint32_t sizeInBytes;
-        uint32_t processId;
+        uint32_t processId; // THIS NEEDS TO BE A PID, NOT A HANDLE
         bool isForeground;
     };
 
@@ -30,4 +30,4 @@ namespace Microsoft::Console
         uint32_t eventType;
         uint32_t ctrlFlags;
     };
-};
+};
diff --git a/src/interactivity/base/HostSignalInputThread.cpp b/src/interactivity/base/HostSignalInputThread.cpp
@@ -96,6 +96,10 @@ T HostSignalInputThread::_ReceiveTypedPacket()
         {
             auto msg = _ReceiveTypedPacket<HostSignalSetForegroundData>();
 
+            // if (wil::unique_handle hClient{ OpenProcess(PROCESS_QUERY_INFORMATION, false, msg.processId) })
+            // {
+            //     LOG_IF_NTSTATUS_FAILED(ServiceLocator::LocateConsoleControl()->SetForeground(hClient.get(), msg.isForeground));
+            // }
             LOG_IF_NTSTATUS_FAILED(ServiceLocator::LocateConsoleControl()->SetForeground(ULongToHandle(msg.processId), msg.isForeground));
 
             break;

diff --git a/src/server/ProcessHandle.cpp b/src/server/ProcessHandle.cpp
@@ -8,6 +8,9 @@
 #include "../host/globals.h"
 #include "../host/telemetry.hpp"
 
+#include "../interactivity/inc/ServiceLocator.hpp"
+
+using namespace Microsoft::Console::Interactivity;
 // Routine Description:
 // - Constructs an instance of the ConsoleProcessHandle Class
 // - NOTE: Can throw if allocation fails or if there is a console policy we do not understand.
@@ -34,6 +37,32 @@ ConsoleProcessHandle::ConsoleProcessHandle(const DWORD dwProcessId,
     {
         Telemetry::Instance().LogProcessConnected(_hProcess.get());
     }
+
+    if (const auto& conhost{ ServiceLocator::LocateGlobals().handoffInboxConsoleHandle })
+    {
+        LOG_IF_WIN32_BOOL_FALSE(DuplicateHandle(GetCurrentProcess(),
+                                                _hProcess.get(),
+                                                conhost.get(),
+                                                _hProcessInConhost.put(),
+                                                0 /*dwDesiredAccess, ignored*/,
+                                                false,
+                                                DUPLICATE_SAME_ACCESS));
+    }
+}
+
+ConsoleProcessHandle::~ConsoleProcessHandle()
+{
+    const auto& conhost{ ServiceLocator::LocateGlobals().handoffInboxConsoleHandle };
+    if (_hProcessInConhost && conhost)
+    {
+        LOG_IF_WIN32_BOOL_FALSE(DuplicateHandle(conhost.get(),
+                                                _hProcessInConhost.get(),
+                                                nullptr /* hTargetProcessHandle */,
+                                                nullptr /* lpTargetHandle, ignored */,
+                                                0 /*dwDesiredAccess, ignored*/,
+                                                false,
+                                                DUPLICATE_CLOSE_SOURCE));
+    }
 }
 
 // Routine Description:

diff --git a/src/server/ProcessHandle.h b/src/server/ProcessHandle.h
@@ -50,7 +50,7 @@ class ConsoleProcessHandle
     ConsoleProcessHandle(const DWORD dwProcessId,
                          const DWORD dwThreadId,
                          const ULONG ulProcessGroupId);
-    ~ConsoleProcessHandle() = default;
+    ~ConsoleProcessHandle();
     ConsoleProcessHandle(const ConsoleProcessHandle&) = delete;
     ConsoleProcessHandle(ConsoleProcessHandle&&) = delete;
     ConsoleProcessHandle& operator=(const ConsoleProcessHandle&) & = delete;
@@ -59,6 +59,7 @@ class ConsoleProcessHandle
     ULONG _ulTerminateCount;
     ULONG const _ulProcessGroupId;
     wil::unique_handle const _hProcess;
+    wil::unique_handle _hProcessInConhost;
 
     mutable ULONG64 _processCreationTime;
 

diff --git a/src/server/ProcessList.cpp b/src/server/ProcessList.cpp
@@ -305,9 +305,9 @@ void ConsoleProcessList::ModifyConsoleProcessFocus(const bool fForeground)
     {
         const auto pProcessHandle = *it;
 
-        if (pProcessHandle->_hProcess != nullptr)
+        if (const auto& handleToUse = pProcessHandle->_hProcessInConhost ? pProcessHandle->_hProcessInConhost : pProcessHandle->_hProcess)
         {
-            _ModifyProcessForegroundRights(pProcessHandle->_hProcess.get(), fForeground);
+            _ModifyProcessForegroundRights(handleToUse.get(), fForeground);
         }
 
         it = std::next(it);