diff --git a/client/KernelManager.h b/client/KernelManager.h index ee65547..5022dd5 100644 --- a/client/KernelManager.h +++ b/client/KernelManager.h @@ -125,17 +125,7 @@ private: bool IsWorkstationLocked() { - HDESK hInput = OpenInputDesktop(0, FALSE, GENERIC_READ); - // 如果无法打开桌面,可能是因为桌面已经切换到 Winlogon - if (!hInput) return true; - char name[256] = {0}; - DWORD needed; - bool isLocked = false; - if (GetUserObjectInformationA(hInput, UOI_NAME, name, sizeof(name), &needed)) { - isLocked = (_stricmp(name, "Winlogon") == 0); - } - CloseDesktop(hInput); - return isLocked; + return ::IsWorkstationLocked(); } }; diff --git a/client/Manager.cpp b/client/Manager.cpp index e6879fe..b6670ea 100644 --- a/client/Manager.cpp +++ b/client/Manager.cpp @@ -156,6 +156,22 @@ HDESK OpenActiveDesktop(ACCESS_MASK dwDesiredAccess) return hInputDesktop; } +bool IsWorkstationLocked() +{ + HDESK hInput = OpenInputDesktop(0, FALSE, GENERIC_READ); + // 打不开输入桌面,通常就是已经切到 Winlogon(锁屏) + if (!hInput) return true; + + char name[256] = { 0 }; + DWORD needed = 0; + bool isLocked = false; + if (GetUserObjectInformationA(hInput, UOI_NAME, name, sizeof(name), &needed)) { + isLocked = (_stricmp(name, "Winlogon") == 0); + } + CloseDesktop(hInput); + return isLocked; +} + // 返回新桌面句柄,如果没有变化返回NULL HDESK IsDesktopChanged(HDESK currentDesk, DWORD accessRights) { diff --git a/client/Manager.h b/client/Manager.h index 8576044..35d4169 100644 --- a/client/Manager.h +++ b/client/Manager.h @@ -15,6 +15,10 @@ HDESK OpenActiveDesktop(ACCESS_MASK dwDesiredAccess = 0); +// 工作站是否已锁屏(输入桌面切到 Winlogon)。锁屏时 DXGI 桌面复制在部分环境会卡在 +// 初始化里不返回,抓屏初始化需要据此提前走 GDI。 +bool IsWorkstationLocked(); + HDESK IsDesktopChanged(HDESK currentDesk, DWORD accessRights); bool SwitchToDesktopIfChanged(HDESK& currentDesk, DWORD accessRights); diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index b3f0d9e..873f87e 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -467,6 +467,26 @@ static BOOL RestoreConsoleSession() return FALSE; } +// 进程所在会话是否已断开(RDP 断开后没有显示输出)。 +// 这种会话里 DXGI 桌面复制拿不到帧,部分驱动上连初始化都不返回,必须走 GDI。 +// Session 0 是服务会话,没有「断开」这个概念,直接返回 FALSE。 +static BOOL IsCurrentSessionDisconnected() +{ + DWORD sessionId = 0; + if (!ProcessIdToSessionId(GetCurrentProcessId(), &sessionId) || sessionId == 0) + return FALSE; + + WTS_CONNECTSTATE_CLASS* pState = NULL; + DWORD bytes = 0; + if (!WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, sessionId, WTSConnectState, + (LPSTR*)&pState, &bytes) || !pState) { + return FALSE; + } + const BOOL disconnected = (*pState == WTSDisconnected); + WTSFreeMemory(pState); + return disconnected; +} + void CScreenManager::InitScreenSpy() { int DXGI = USING_GDI; @@ -551,7 +571,20 @@ void CScreenManager::InitScreenSpy() } } SAFE_DELETE(m_ScreenSpyObject); - if ((USING_DXGI == DXGI && IsWindows8orHigher())) { + // 锁屏(输入桌面切到 Winlogon)或会话已断开时,当前会话没有可用的交互桌面: + // DXGI 桌面复制拿不到帧,部分环境(无 GPU 的 Server、断开/锁定的 RDP 会话) + // 甚至会在初始化里卡死不返回 —— 那样 InitScreenSpy 走不完,WorkThreadProc 里 + // 紧随其后的 SendBitMapInfo() 永远发不出去,主控端一直等不到 TOKEN_BITMAPINFO, + // 连远程桌面窗口都不会弹。GDI 的 BitBlt 不依赖桌面变化,这些情况下照样能抓, + // 所以直接走 GDI。 + const BOOL locked = IsWorkstationLocked(); + const BOOL disconnected = IsCurrentSessionDisconnected(); + const bool noDesktop = (USING_DXGI == DXGI && (locked || disconnected)); + if (noDesktop) { + Mprintf("CScreenManager: no interactive desktop (locked=%d, disconnected=%d), use GDI instead of DXGI\n", + (int)locked, (int)disconnected); + } + if ((USING_DXGI == DXGI && IsWindows8orHigher() && !noDesktop)) { m_isGDI = FALSE; auto s = new ScreenCapturerDXGI(algo, DEFAULT_GOP, all, m_ScreenSettings.EncodeLevel, rect, switchScreen); if (s->IsInitSucceed()) {