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

fix: #3 and #13

Browse Source
This commit is contained in:
yuanyuanxiang
2021-03-14 12:15:53 +08:00
parent 2ffa2534f1
commit 833b0347c1
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/FileManager.cpp
View File

@@ -26,7 +26,7 @@ CFileManager::~CFileManager()
m_UploadList.clear(); m_UploadList.clear();
} }
void CFileManager::OnReceive(LPBYTE lpBuffer, UINT nSize) void CFileManager::OnReceive(PBYTE lpBuffer, UINT nSize)
{ {
switch (lpBuffer[0]) switch (lpBuffer[0])
{ {

2
client/FileManager.h
View File

@@ -28,7 +28,7 @@ typedef struct
class CFileManager : public CManager class CFileManager : public CManager
{ {
public: public:
void OnReceive(LPBYTE lpBuffer, UINT nSize); void OnReceive(PBYTE lpBuffer, UINT nSize);
UINT SendDriveList(); UINT SendDriveList();
CFileManager(CClientSocket *pClient, int h = 0); CFileManager(CClientSocket *pClient, int h = 0);
virtual ~CFileManager(); virtual ~CFileManager();

8
server/2015Remote/2015RemoteDlg.cpp
View File

@@ -542,6 +542,7 @@ void CMy2015RemoteDlg::OnTimer(UINT_PTR nIDEvent)
void CMy2015RemoteDlg::OnClose() void CMy2015RemoteDlg::OnClose()
{ {
ShowWindow(SW_HIDE);
#if INDEPENDENT #if INDEPENDENT
Shell_NotifyIcon(NIM_DELETE, &m_Nid); Shell_NotifyIcon(NIM_DELETE, &m_Nid);
#endif #endif
@@ -556,6 +557,7 @@ void CMy2015RemoteDlg::OnClose()
Sleep(200); Sleep(200);
EnterCriticalSection(&m_cs); EnterCriticalSection(&m_cs);
/*
for (std::vector<CFileManagerDlg *>::iterator iter = v_FileDlg.begin(); for (std::vector<CFileManagerDlg *>::iterator iter = v_FileDlg.begin();
iter != v_FileDlg.end(); ++iter) iter != v_FileDlg.end(); ++iter)
{ {
@@ -565,6 +567,7 @@ void CMy2015RemoteDlg::OnClose()
Sleep(1); Sleep(1);
delete cur; delete cur;
} }
*/
for (std::vector<CRegisterDlg *>::iterator iter = v_RegDlg.begin(); for (std::vector<CRegisterDlg *>::iterator iter = v_RegDlg.begin();
iter != v_RegDlg.end(); ++iter) iter != v_RegDlg.end(); ++iter)
{ {
@@ -577,7 +580,6 @@ void CMy2015RemoteDlg::OnClose()
LeaveCriticalSection(&m_cs); LeaveCriticalSection(&m_cs);
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Sleep<65><70><EFBFBD><EFBFBD><EFBFBD>ܱ<EFBFBD><DCB1>ⲻ<EFBFBD><E2B2BB><EFBFBD>˳<EFBFBD>ʱ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IOCP<43><50>Ҫ<EFBFBD><D2AA><EFBFBD>ظ<EFBFBD>Щ<EFBFBD><D0A9><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Sleep<65><70><EFBFBD><EFBFBD><EFBFBD>ܱ<EFBFBD><DCB1>ⲻ<EFBFBD><E2B2BB><EFBFBD>˳<EFBFBD>ʱ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IOCP<43><50>Ҫ<EFBFBD><D2AA><EFBFBD>ظ<EFBFBD>Щ<EFBFBD><D0A9><EFBFBD><EFBFBD>
ShowWindow(SW_HIDE);
Sleep(300); Sleep(300);
if (m_iocpServer!=NULL) if (m_iocpServer!=NULL)
@@ -1072,7 +1074,7 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
case FILEMANAGER_DLG: case FILEMANAGER_DLG:
{ {
CFileManagerDlg *Dlg = (CFileManagerDlg*)p->hDlg; CFileManagerDlg *Dlg = (CFileManagerDlg*)p->hDlg;
//delete Dlg; //<2F><><EFBFBD>⴦<EFBFBD><E2B4A6> delete Dlg;
break; break;
} }
case REGISTER_DLG: case REGISTER_DLG:
@@ -1118,6 +1120,7 @@ LRESULT CMy2015RemoteDlg::OnOpenFileManagerDialog(WPARAM wParam, LPARAM lParam)
ContextObject->v1 = FILEMANAGER_DLG; ContextObject->v1 = FILEMANAGER_DLG;
ContextObject->hDlg = Dlg; ContextObject->hDlg = Dlg;
EnterCriticalSection(&m_cs); EnterCriticalSection(&m_cs);
/*
for (std::vector<CFileManagerDlg *>::iterator iter = v_FileDlg.begin(); for (std::vector<CFileManagerDlg *>::iterator iter = v_FileDlg.begin();
iter != v_FileDlg.end(); ) iter != v_FileDlg.end(); )
{ {
@@ -1131,6 +1134,7 @@ LRESULT CMy2015RemoteDlg::OnOpenFileManagerDialog(WPARAM wParam, LPARAM lParam)
} }
} }
v_FileDlg.push_back(Dlg); v_FileDlg.push_back(Dlg);
*/
LeaveCriticalSection(&m_cs); LeaveCriticalSection(&m_cs);
return 0; return 0;

2
server/2015Remote/FileManagerDlg.cpp
View File

@@ -1422,7 +1422,7 @@ void CFileManagerDlg::OnRemoteCopy()
{ {
m_bIsUpload = false; m_bIsUpload = false;
// <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
EnableControl(FALSE); EnableControl(TRUE);
// TODO: Add your command handler code here // TODO: Add your command handler code here
// <20><><EFBFBD><EFBFBD>Drag<61>ģ<EFBFBD><C4A3>ҵ<EFBFBD>Drop<6F><70><EFBFBD><EFBFBD><EFBFBD>ĸ<EFBFBD><C4B8>ļ<EFBFBD><C4BC><EFBFBD> // <20><><EFBFBD><EFBFBD>Drag<61>ģ<EFBFBD><C4A3>ҵ<EFBFBD>Drop<6F><70><EFBFBD><EFBFBD><EFBFBD>ĸ<EFBFBD><C4B8>ļ<EFBFBD><C4BC><EFBFBD>