Skip to content

feat: 解析 VDD 驱动管道新响应格式，优化创建等待 #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShadowLemoon wants to merge 2 commits into
base: master
Choose a base branch
from
+45 −13
Open

feat: 解析 VDD 驱动管道新响应格式，优化创建等待 #587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dbabbd
feat: 解析 VDD 驱动管道新响应格式，优化创建等待
ShadowLemoon Apr 8, 2026
c9364cc
fix: 两个调用点检查驱动返回值
ShadowLemoon Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/display_device/vdd_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ namespace display_device {
}

bool
execute_pipe_command(const wchar_t *pipe_name, const wchar_t *command, std::string *response, bool *timed_out) {
execute_pipe_command(const wchar_t *pipe_name, const wchar_t *command, std::string *response, bool *timed_out, DWORD read_timeout_ms) {
auto hPipe = connect_to_pipe_with_retry(pipe_name);
if (hPipe == INVALID_HANDLE_VALUE) {
BOOST_LOG(error) << "连接MTT虚拟显示管道失败，已重试多次";
Expand Down Expand Up @@ -180,6 +180,7 @@ namespace display_device {
}

// 读取响应
const DWORD effective_read_timeout = (read_timeout_ms > 0) ? read_timeout_ms : kPipeTimeoutMs;
bool read_timed_out = false;
if (response) {
char buffer[kPipeBufferSize];
Expand All @@ -190,7 +191,7 @@ namespace display_device {
return false;
}

DWORD waitResult = WaitForSingleObject(overlapped.hEvent, kPipeTimeoutMs);
DWORD waitResult = WaitForSingleObject(overlapped.hEvent, effective_read_timeout);
if (waitResult == WAIT_OBJECT_0 && GetOverlappedResult(hPipe, &overlapped, &bytesRead, FALSE)) {
buffer[bytesRead] = '\0';
*response = std::string(buffer, bytesRead);
Expand Down Expand Up @@ -322,14 +323,16 @@ namespace display_device {
}

// 尝试发送命令（带GUID或不带GUID）
// 使用更长的读取超时，因为新版驱动会在管道中等待CCD系统就绪
constexpr DWORD kCreateMonitorReadTimeoutMs = 20000;
bool read_timed_out = false;
bool success = execute_pipe_command(kVddPipeName, command.c_str(), &response, &read_timed_out);
bool success = execute_pipe_command(kVddPipeName, command.c_str(), &response, &read_timed_out, kCreateMonitorReadTimeoutMs);

// 如果带GUID的命令失败，降级为不带GUID的命令（兼容旧版驱动）
if (!success && !guid_str.empty()) {
BOOST_LOG(warning) << "带GUID的命令失败，尝试降级为不带GUID的命令";
read_timed_out = false;
success = execute_pipe_command(kVddPipeName, L"CREATEMONITOR", &response, &read_timed_out);
success = execute_pipe_command(kVddPipeName, L"CREATEMONITOR", &response, &read_timed_out, kCreateMonitorReadTimeoutMs);
}

if (!success) {
Expand All @@ -340,7 +343,23 @@ namespace display_device {
#if defined SUNSHINE_TRAY && SUNSHINE_TRAY >= 1
system_tray::update_vdd_menu();
#endif
BOOST_LOG(info) << "创建虚拟显示器完成，响应: " << response << " [return=" << (read_timed_out ? 1 : 0) << "]";

// 解析驱动响应：OK = CCD已就绪, OK_PENDING = 创建成功但CCD未就绪, FAIL = 创建失败
if (response == "FAIL") {
BOOST_LOG(error) << "驱动端报告虚拟显示器创建失败";
return false;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

if (response == "OK") {
BOOST_LOG(info) << "创建虚拟显示器完成，驱动确认CCD已就绪";
}
else if (response == "OK_PENDING") {
BOOST_LOG(warning) << "创建虚拟显示器完成，但CCD系统尚未就绪（驱动等待超时）";
}
else {
// 旧版驱动不返回响应（read_timed_out=true），视为成功
BOOST_LOG(info) << "创建虚拟显示器完成，响应: " << response << " [return=" << (read_timed_out ? 1 : 0) << "]";
}
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/display_device/vdd_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace display_device::vdd_utils {
connect_to_pipe_with_retry(const wchar_t *pipe_name, int max_retries = 3);

bool
execute_pipe_command(const wchar_t *pipe_name, const wchar_t *command, std::string *response = nullptr, bool *timed_out = nullptr);
execute_pipe_command(const wchar_t *pipe_name, const wchar_t *command, std::string *response = nullptr, bool *timed_out = nullptr, DWORD read_timeout_ms = 0);

// 驱动重载函数
bool
Expand Down