fix: Fix freeze when closing terminal on newer Windows 11

Windows 11 24H2 changed the underlying implementation and the
"ClosePseudoConsole" code that we copied from the Terminal application
didn't work as it did before.

The new Terminal releases also removes the WaitForSingleObject call.
See microsoft/terminal#17704

Signed-off-by: xiaoming <[email protected]>

Author: QQxiaoming

lib/ptyqt/conptyprocess.cpp

@@ -574,34 +574,11 @@ void _ClosePseudoConsoleMembers(_In_ PseudoConsole* pPty)
 {
     if (pPty != nullptr)
     {
-        // See MSFT:19918626
-        // First break the signal pipe - this will trigger conhost to tear itself down
         if (_HandleIsValid(pPty->hSignal))
         {
             CloseHandle(pPty->hSignal);
             pPty->hSignal = nullptr;
         }
-        // Then, wait on the conhost process before killing it.
-        // We do this to make sure the conhost finishes flushing any output it
-        //      has yet to send before we hard kill it.
-        if (_HandleIsValid(pPty->hConPtyProcess))
-        {
-            // If the conhost is already dead, then that's fine. Presumably
-            //      it's finished flushing it's output already.
-            DWORD dwExit = 0;
-            // If GetExitCodeProcess failed, it's likely conhost is already dead
-            //      If so, skip waiting regardless of whatever error
-            //      GetExitCodeProcess returned.
-            //      We'll just go straight to killing conhost.
-            if (GetExitCodeProcess(pPty->hConPtyProcess, &dwExit) && dwExit == STILL_ACTIVE)
-            {
-                WaitForSingleObject(pPty->hConPtyProcess, INFINITE);
-            }
-
-            TerminateProcess(pPty->hConPtyProcess, 0);
-            CloseHandle(pPty->hConPtyProcess);
-            pPty->hConPtyProcess = nullptr;
-        }
         // Then take care of the reference handle.
         // TODO GH#1810: Closing the reference handle late leaves conhost thinking
         // that we have an outstanding connected client.
@@ -610,6 +587,11 @@ void _ClosePseudoConsoleMembers(_In_ PseudoConsole* pPty)
             CloseHandle(pPty->hPtyReference);
             pPty->hPtyReference = nullptr;
         }
+        if (_HandleIsValid(pPty->hConPtyProcess))
+        {
+            CloseHandle(pPty->hConPtyProcess);
+            pPty->hConPtyProcess = nullptr;
+        }
     }
 }
 
@@ -995,8 +977,11 @@ bool ConPtyProcess::startProcess(const QString &executable,
                          GetExitCodeProcess(hEvent, &exitCode);
                          m_exitCode = exitCode;
                          // Do not respawn if the object is about to be destructed
-                         if (!m_aboutToDestruct)
-                             emit notifier()->aboutToClose();
+                         if (!m_aboutToDestruct) {
+                            ConptyClosePseudoConsole(m_ptyHandler);
+                            m_ptyHandler = INVALID_HANDLE_VALUE;
+                            emit notifier() -> aboutToClose();
+                         }
                          m_shellCloseWaitNotifier->setEnabled(false);
                      }, Qt::QueuedConnection);
 
@@ -1054,49 +1039,45 @@ bool ConPtyProcess::resize(qint16 cols, qint16 rows)
 
 bool ConPtyProcess::kill()
 {
-    bool exitCode = false;
-
     if (m_ptyHandler != INVALID_HANDLE_VALUE) {
         m_aboutToDestruct = true;
 
         // Close ConPTY - this will terminate client process if running
         WindowsContext::instance().closePseudoConsole(m_ptyHandler);
+    }
 
-        // Clean-up the pipes
-        if (INVALID_HANDLE_VALUE != m_hPipeOut)
-            CloseHandle(m_hPipeOut);
-        if (INVALID_HANDLE_VALUE != m_hPipeIn)
-            CloseHandle(m_hPipeIn);
-
-        if (m_readThread) {
-            m_readThread->requestInterruption();
-            if (!m_readThread->wait(1000))
-                m_readThread->terminate();
-            m_readThread->deleteLater();
-            m_readThread = nullptr;
-        }
-
-        delete m_shellCloseWaitNotifier;
-        m_shellCloseWaitNotifier = nullptr;
+    // Clean-up the pipes
+    if (INVALID_HANDLE_VALUE != m_hPipeOut)
+        CloseHandle(m_hPipeOut);
+    if (INVALID_HANDLE_VALUE != m_hPipeIn)
+        CloseHandle(m_hPipeIn);
+
+    if (m_readThread) {
+        m_readThread->requestInterruption();
+        if (!m_readThread->wait(1000))
+            m_readThread->terminate();
+        m_readThread->deleteLater();
+        m_readThread = nullptr;
+    }
 
-        m_pid = 0;
-        m_ptyHandler = INVALID_HANDLE_VALUE;
-        m_hPipeIn = INVALID_HANDLE_VALUE;
-        m_hPipeOut = INVALID_HANDLE_VALUE;
+    delete m_shellCloseWaitNotifier;
+    m_shellCloseWaitNotifier = nullptr;
 
-        CloseHandle(m_shellProcessInformation.hThread);
-        CloseHandle(m_shellProcessInformation.hProcess);
+    m_pid = 0;
+    m_ptyHandler = INVALID_HANDLE_VALUE;
+    m_hPipeIn = INVALID_HANDLE_VALUE;
+    m_hPipeOut = INVALID_HANDLE_VALUE;
 
-        // Cleanup attribute list
-        if (m_shellStartupInfo.lpAttributeList) {
-            DeleteProcThreadAttributeList(m_shellStartupInfo.lpAttributeList);
-            HeapFree(GetProcessHeap(), 0, m_shellStartupInfo.lpAttributeList);
-        }
+    CloseHandle(m_shellProcessInformation.hThread);
+    CloseHandle(m_shellProcessInformation.hProcess);
 
-        exitCode = true;
+    // Cleanup attribute list
+    if (m_shellStartupInfo.lpAttributeList) {
+        DeleteProcThreadAttributeList(m_shellStartupInfo.lpAttributeList);
+        HeapFree(GetProcessHeap(), 0, m_shellStartupInfo.lpAttributeList);
     }
 
-    return exitCode;
+    return true;
 }
 
 IPtyProcess::PtyType ConPtyProcess::type()
@@ -1208,10 +1189,6 @@ ConPtyProcess::pidTree_t ConPtyProcess::processInfoTree()
 
 bool ConPtyProcess::isAvailable()
 {
-#ifdef TOO_OLD_WINSDK
-    return false; //very importnant! ConPty can be built, but it doesn't work if built with old sdk and Win10 < 1903
-#endif
-
     qint32 buildNumber = QSysInfo::kernelVersion().split(".").last().toInt();
     if (buildNumber < CONPTY_MINIMAL_WINDOWS_VERSION)
         return false;

lib/ptyqt/conptyprocess.h

@@ -19,8 +19,6 @@
   ProcThreadAttributeValue(22, FALSE, TRUE, FALSE)
 
 typedef VOID* HPCON;
-
-#define TOO_OLD_WINSDK
 #endif
 
 class QWinEventNotifier;

src/sessionswindow/sessionswindow.cpp

@@ -848,8 +848,21 @@ int SessionsWindow::startLocalShellSession(const QString &command,QString profil
     }
     connect(localShell->notifier(), &QIODevice::readyRead, this, [=](){
         QByteArray data = localShell->readAll();
-        if(doRecvData(data)) {
-            term->recvData(data.data(), data.size());
+        if (!data.isEmpty()) {
+            if(doRecvData(data)) {
+                term->recvData(data.data(), data.size());
+            }
+        }
+    });
+    connect(localShell->notifier(), &QIODevice::aboutToClose, this, [this] {
+        if (localShell) {
+            QByteArray restOfOutput = localShell->readAll();
+            if (!restOfOutput.isEmpty()) {
+                if(doRecvData(restOfOutput)) {
+                    term->recvData(restOfOutput.data(), restOfOutput.size());
+                }
+                localShell->notifier()->disconnect();
+            }
         }
     });
     connect(this,&SessionsWindow::modemProxySendData,this,[=](QByteArray data){