diff --git a/client/ClientDll.vcxproj b/client/ClientDll.vcxproj index d448fc9..190cd41 100644 --- a/client/ClientDll.vcxproj +++ b/client/ClientDll.vcxproj @@ -65,7 +65,7 @@ true MultiThreaded ./;%(AdditionalIncludeDirectories) - ZLIB_WINAPI;%(PreprocessorDefinitions) + ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/client/FileManager.cpp b/client/FileManager.cpp index 84498f3..c17bd14 100644 --- a/client/FileManager.cpp +++ b/client/FileManager.cpp @@ -592,7 +592,7 @@ void CFileManager::CreateLocalRecvFile(LPBYTE lpBuffer) strcpy(m_strCurrentProcessFileName, (char *)lpBuffer + 8); // 保存文件长度 - m_nCurrentProcessFileLength = (pFileSize->dwSizeHigh * (MAXDWORD + 1)) + pFileSize->dwSizeLow; + m_nCurrentProcessFileLength = (pFileSize->dwSizeHigh * (MAXDWORD + long long(1))) + pFileSize->dwSizeLow; // 创建多层目录 MakeSureDirectoryPathExists(m_strCurrentProcessFileName); diff --git a/client/IOCPClient.h b/client/IOCPClient.h index 912fab9..4f598d9 100644 --- a/client/IOCPClient.h +++ b/client/IOCPClient.h @@ -55,7 +55,7 @@ public: VOID Disconnect(); VOID RunEventLoop(const BOOL &bCondition); - bool IsConnected() const { return m_bConnected; } + bool IsConnected() const { return m_bConnected == TRUE; } public: class CManager* m_Manager; diff --git a/client/TestRun.vcxproj b/client/TestRun.vcxproj index 77a060e..6738086 100644 --- a/client/TestRun.vcxproj +++ b/client/TestRun.vcxproj @@ -59,6 +59,7 @@ true MultiThreaded true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/client/ghost.vcxproj b/client/ghost.vcxproj index d460b78..f6976af 100644 --- a/client/ghost.vcxproj +++ b/client/ghost.vcxproj @@ -70,7 +70,7 @@ true MultiThreaded ./;%(AdditionalIncludeDirectories) - _CONSOLE;ZLIB_WINAPI;%(PreprocessorDefinitions) + _CONSOLE;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/server/2015Remote/FileManagerDlg.cpp b/server/2015Remote/FileManagerDlg.cpp index 929a0ba..e6718d2 100644 --- a/server/2015Remote/FileManagerDlg.cpp +++ b/server/2015Remote/FileManagerDlg.cpp @@ -1090,7 +1090,7 @@ void CFileManagerDlg::FixedRemoteFileList(BYTE *pbBuffer, DWORD dwBufferLen) memcpy(&dwFileSizeHigh, pList, 4); memcpy(&dwFileSizeLow, pList + 4, 4); CString strSize; - strSize.Format("%10d KB", (dwFileSizeHigh * (MAXDWORD+1)) / 1024 + dwFileSizeLow / 1024 + (dwFileSizeLow % 1024 ? 1 : 0)); + strSize.Format("%10d KB", (dwFileSizeHigh * (MAXDWORD+long long(1))) / 1024 + dwFileSizeLow / 1024 + (dwFileSizeLow % 1024 ? 1 : 0)); m_list_remote.SetItemText(nItem, 1, strSize); memcpy(&ftm_strReceiveLocalFileTime, pList + 8, sizeof(FILETIME)); CTime time(ftm_strReceiveLocalFileTime); @@ -1503,7 +1503,7 @@ BOOL CFileManagerDlg::SendUploadJob() if (hFile == INVALID_HANDLE_VALUE) return FALSE; dwSizeLow = GetFileSize (hFile, &dwSizeHigh); - m_nOperatingFileLength = (dwSizeHigh * (MAXDWORD+1)) + dwSizeLow; + m_nOperatingFileLength = (dwSizeHigh * (MAXDWORD+long long(1))) + dwSizeLow; CloseHandle(hFile); // 构造数据包,发送文件长度 @@ -1537,7 +1537,7 @@ BOOL CFileManagerDlg::SendDeleteJob() if (file.GetAt(file.GetLength() - 1) == '\\') { - ShowMessage("远程:删除目录 %s\*.* 完成", file); + ShowMessage("远程:删除目录 %s\\*.* 完成", file); bPacket[0] = COMMAND_DELETE_DIRECTORY; } else @@ -1579,7 +1579,7 @@ void CFileManagerDlg::CreateLocalRecvFile() DWORD dwSizeHigh = pFileSize->dwSizeHigh; DWORD dwSizeLow = pFileSize->dwSizeLow; - m_nOperatingFileLength = (dwSizeHigh * (MAXDWORD+1)) + dwSizeLow; + m_nOperatingFileLength = (dwSizeHigh * (MAXDWORD+long long(1))) + dwSizeLow; // 当前正操作的文件名 m_strOperatingFile = m_pContext->m_DeCompressionBuffer.GetBuffer(9); @@ -1669,7 +1669,7 @@ void CFileManagerDlg::CreateLocalRecvFile() memcpy(bToken + 1, &FindFileData.nFileSizeHigh, 4); memcpy(bToken + 5, &FindFileData.nFileSizeLow, 4); // 接收的长度递增 - m_nCounter += FindFileData.nFileSizeHigh * (MAXDWORD+1); + m_nCounter += FindFileData.nFileSizeHigh * (MAXDWORD+long long(1)); m_nCounter += FindFileData.nFileSizeLow; dwCreationDisposition = OPEN_EXISTING; @@ -1818,7 +1818,7 @@ void CFileManagerDlg::EndLocalRecvFile() m_nTransferMode = TRANSFER_MODE_NORMAL; EnableControl(TRUE); FixedLocalFileList("."); - ShowMessage("本地:装载目录 %s\*.* 完成", m_Local_Path); + ShowMessage("本地:装载目录 %s\\*.* 完成", m_Local_Path); } else { @@ -1841,7 +1841,7 @@ void CFileManagerDlg::EndLocalUploadFile() m_bIsStop = false; EnableControl(TRUE); GetRemoteFileList("."); - ShowMessage("远程:装载目录 %s\*.* 完成", m_Remote_Path); + ShowMessage("远程:装载目录 %s\\*.* 完成", m_Remote_Path); } else { @@ -1859,7 +1859,7 @@ void CFileManagerDlg::EndRemoteDeleteFile() m_bIsStop = false; EnableControl(TRUE); GetRemoteFileList("."); - ShowMessage("远程:装载目录 %s\*.* 完成", m_Remote_Path); + ShowMessage("远程:装载目录 %s\\*.* 完成", m_Remote_Path); } else {