diff --git a/server/2015Remote/ConnectionsDlg.cpp b/server/2015Remote/ConnectionsDlg.cpp index e82fc2c..326db57 100644 --- a/server/2015Remote/ConnectionsDlg.cpp +++ b/server/2015Remote/ConnectionsDlg.cpp @@ -93,6 +93,31 @@ static CString AddrSortKey(uint8_t af, const uint8_t* addr) return key; } +// 进程名是客户端按 UTF-8 发来的(client/ConnectionsManager.cpp ResolveProcName 用 +// WideCharToMultiByte(CP_UTF8) 编码)。显示必须走宽字符直写:本工程是 MBCS 构建, +// CA2T(x, CP_UTF8) 展开成 CA2A,而 CA2A 的 nCodePage 参数被 ATL 显式忽略 +// (atlconv.h 里就是一句 "(void)nCodePage"),等于把 UTF-8 字节原样拷进 CString +// 再按 GBK 渲染——中文名全是乱码,纯 ASCII 名恰好两个编码同形所以看不出来。 +// 与客户端列表(CClientListDlg)/进程管理同法:转 UTF-16 后 LVM_SETITEMTEXTW 直写, +// 绕开 ANSI 代码页,服务端即使在非中文 ACP 上也能正常显示。 +static void SetUtf8ItemText(CListCtrl& list, int iItem, int iSubItem, const char* sz) +{ + std::wstring w; + if (sz && sz[0]) { + int wlen = MultiByteToWideChar(CP_UTF8, 0, sz, -1, NULL, 0); + if (wlen > 1) { + w.resize(wlen - 1); + MultiByteToWideChar(CP_UTF8, 0, sz, -1, &w[0], wlen); + } + } + LVITEMW lv = {}; + lv.mask = LVIF_TEXT; + lv.iItem = iItem; + lv.iSubItem = iSubItem; + lv.pszText = w.empty() ? const_cast(L"") : &w[0]; + ::SendMessageW(list.GetSafeHwnd(), LVM_SETITEMTEXTW, (WPARAM)iItem, (LPARAM)&lv); +} + BOOL CConnectionsDlg::OnInitDialog() { __super::OnInitDialog(); @@ -144,11 +169,10 @@ int CConnectionsDlg::ShowConnectionList(void) CString strRemoteAddr = FormatAddr(info->af, info->remoteAddr); CString strState = (info->proto == 1) ? TcpStateName(info->state) : _T("-"); - CString strLocalPort, strRemotePort, strPid, strProcName; + CString strLocalPort, strRemotePort, strPid; strLocalPort.Format(_T("%u"), info->localPort); strRemotePort.Format(_T("%u"), info->remotePort); strPid.Format(_T("%u"), info->pid); - strProcName = CA2T(info->procName, CP_UTF8); auto* data = new ConnItemData; data->info = *info; @@ -159,7 +183,9 @@ int CConnectionsDlg::ShowConnectionList(void) data->key[4].Format(_T("%05u"), info->remotePort); data->key[5].Format(_T("%03u"), info->state); data->key[6].Format(_T("%010u"), info->pid); - data->key[7] = strProcName; + // 排序键存原始 UTF-8 字节:UTF-8 的字节序比较等价于码点序比较,比转成 + // 任何 ANSI 代码页再比都稳,也不会因转换丢字。 + data->key[7] = info->procName; m_ControlList.InsertItem(i, strProto); m_ControlList.SetItemText(i, 1, strLocalAddr); @@ -168,7 +194,7 @@ int CConnectionsDlg::ShowConnectionList(void) m_ControlList.SetItemText(i, 4, strRemotePort); m_ControlList.SetItemText(i, 5, strState); m_ControlList.SetItemText(i, 6, strPid); - m_ControlList.SetItemText(i, 7, strProcName); + SetUtf8ItemText(m_ControlList, i, 7, info->procName); m_ControlList.SetItemData(i, (DWORD_PTR)data); }