admin/SimpleRemoter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: #27 Support sorting for service list

Browse Source
This commit is contained in:
yuanyuanxiang
2025-01-12 03:39:54 +08:00
parent c58a9dbe73
commit 1694cabd39
3 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
server/2015Remote/ServicesDlg.cpp
View File

@@ -11,6 +11,14 @@
IMPLEMENT_DYNAMIC(CServicesDlg, CDialog)
// ItemData1 <20><>Ҫ<EFBFBD><D2AA>ItemDataͬ<61><CDAC><EFBFBD>ˣ<EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD>Ի<EFBFBD><D4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
typedef struct ItemData1
{
CString Data[5];
CString GetData(int index) const {
return this ? Data[index] : "";
}
} ItemData1;
CServicesDlg::CServicesDlg(CWnd* pParent, IOCPServer* IOCPServer, CONTEXT_OBJECT *ContextObject)
: CDialog(CServicesDlg::IDD, pParent)
@@ -39,6 +47,7 @@ BEGIN_MESSAGE_MAP(CServicesDlg, CDialog)
ON_COMMAND(ID_SERVICES_START, &CServicesDlg::OnServicesStart)
ON_COMMAND(ID_SERVICES_REFLASH, &CServicesDlg::OnServicesReflash)
ON_NOTIFY(NM_RCLICK, IDC_LIST, &CServicesDlg::OnNMRClickList)
ON_NOTIFY(HDN_ITEMCLICK, 0, &CServicesDlg::OnHdnItemclickList)
END_MESSAGE_MAP()
@@ -79,7 +88,7 @@ int CServicesDlg::ShowServicesList(void)
char *szAutoRun;
char *szFilePath;
DWORD dwOffset = 0;
m_ControlList.DeleteAllItems();
DeleteAllItems();
int i = 0;
for (i = 0; dwOffset < m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1; ++i)
@@ -95,7 +104,8 @@ int CServicesDlg::ShowServicesList(void)
m_ControlList.SetItemText(i, 2, szAutoRun);
m_ControlList.SetItemText(i, 3, szRunWay);
m_ControlList.SetItemText(i, 4, szFilePath );
auto data = new ItemData1{ szServiceName, szDisplayName, szAutoRun, szRunWay, szFilePath };
m_ControlList.SetItemData(i, (DWORD_PTR)data);
dwOffset += lstrlen(szDisplayName) + lstrlen(szServiceName) + lstrlen(szFilePath) + lstrlen(szRunWay)
+ lstrlen(szAutoRun) +5;
}
@@ -114,6 +124,7 @@ void CServicesDlg::OnClose()
#if CLOSE_DELETE_DLG
m_ContextObject->v1 = 0;
#endif
DeleteAllItems();
CancelIo((HANDLE)m_ContextObject->sClientSocket);
closesocket(m_ContextObject->sClientSocket);
CDialog::OnClose();
@@ -153,6 +164,57 @@ void CServicesDlg::OnServicesReflash()
m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, 1);
}
// <20>ͷ<EFBFBD><CDB7><EFBFBD>Դ<EFBFBD>Ժ<EFBFBD><D4BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void CServicesDlg::DeleteAllItems() {
for (int i = 0; i < m_ControlList.GetItemCount(); i++)
{
auto data = (ItemData1*)m_ControlList.GetItemData(i);
if (NULL != data) {
delete data;
}
}
m_ControlList.DeleteAllItems();
}
int CALLBACK CServicesDlg::CompareFunction(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) {
auto* pSortInfo = reinterpret_cast<std::pair<int, bool>*>(lParamSort);
int nColumn = pSortInfo->first;
bool bAscending = pSortInfo->second;
// <20><>ȡ<EFBFBD><C8A1>ֵ
ItemData1* context1 = (ItemData1*)lParam1;
ItemData1* context2 = (ItemData1*)lParam2;
CString s1 = context1->GetData(nColumn);
CString s2 = context2->GetData(nColumn);
int result = s1 > s2 ? 1 : -1;
return bAscending ? result : -result;
}
void CServicesDlg::SortByColumn(int nColumn) {
static int m_nSortColumn = 0;
static bool m_bSortAscending = false;
if (nColumn == m_nSortColumn) {
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬһ<CDAC>У<EFBFBD><D0A3>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD><CBB3>
m_bSortAscending = !m_bSortAscending;
}
else {
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>
m_nSortColumn = nColumn;
m_bSortAscending = true;
}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
std::pair<int, bool> sortInfo(m_nSortColumn, m_bSortAscending);
m_ControlList.SortItems(CompareFunction, reinterpret_cast<LPARAM>(&sortInfo));
}
void CServicesDlg::OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult) {
LPNMHEADER pNMHeader = reinterpret_cast<LPNMHEADER>(pNMHDR);
int nColumn = pNMHeader->iItem; // <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
SortByColumn(nColumn); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*pResult = 0;
}
void CServicesDlg::OnNMRClickList(NMHDR *pNMHDR, LRESULT *pResult)
{

6
server/2015Remote/ServicesDlg.h
View File

@@ -27,6 +27,12 @@ protected:
public:
CListCtrl m_ControlList;
virtual BOOL OnInitDialog();
void DeleteAllItems();
void SortByColumn(int nColumn);
afx_msg VOID OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult);
static int CALLBACK CompareFunction(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
CStatic m_ServicesCount;
afx_msg void OnClose();
afx_msg void OnServicesAuto();