style: 更新zlib为不带ASMINF编译的静态库
This commit is contained in:
@@ -514,7 +514,6 @@ int CFileManager::SendToken(BYTE bToken)
|
|||||||
|
|
||||||
bool CFileManager::UploadToRemote(LPBYTE lpBuffer)
|
bool CFileManager::UploadToRemote(LPBYTE lpBuffer)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (lpBuffer[lstrlen((char *)lpBuffer) - 1] == '\\')
|
if (lpBuffer[lstrlen((char *)lpBuffer) - 1] == '\\')
|
||||||
{
|
{
|
||||||
FixedUploadList((char *)lpBuffer);
|
FixedUploadList((char *)lpBuffer);
|
||||||
|
|||||||
@@ -279,7 +279,9 @@ VOID IOCPClient::OnServerReceiving(char* szBuffer, ULONG ulLength)
|
|||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}catch(...) { }
|
}catch(...) {
|
||||||
|
printf("[ERROR] OnServerReceiving catch an error \n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,9 @@ int CManager::Send(LPBYTE lpData, UINT nSize)
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
nRet = m_ClientObject->OnServerSending((char*)lpData, nSize);
|
nRet = m_ClientObject->OnServerSending((char*)lpData, nSize);
|
||||||
}catch(...){};
|
}catch(...){
|
||||||
|
printf("[ERROR] CManager::Send catch an error \n");
|
||||||
|
};
|
||||||
return nRet;
|
return nRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
client/zlib.lib
BIN
client/zlib.lib
Binary file not shown.
@@ -998,7 +998,9 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
|
|||||||
|
|
||||||
AddList(strIP,strAddr,strPCName,strOS,strCPU,strVideo,strPing,ContextObject);
|
AddList(strIP,strAddr,strPCName,strOS,strCPU,strVideo,strPing,ContextObject);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}catch(...){}
|
}catch(...){
|
||||||
|
OutputDebugStringA("[ERROR] OnUserToOnlineList catch an error \n");
|
||||||
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -921,11 +921,29 @@ void CFileManagerDlg::OnReceiveComplete()
|
|||||||
switch (m_pContext->m_DeCompressionBuffer.GetBuffer(0)[0])
|
switch (m_pContext->m_DeCompressionBuffer.GetBuffer(0)[0])
|
||||||
{
|
{
|
||||||
case TOKEN_FILE_LIST: // <20>ļ<EFBFBD><C4BC>б<EFBFBD>
|
case TOKEN_FILE_LIST: // <20>ļ<EFBFBD><C4BC>б<EFBFBD>
|
||||||
FixedRemoteFileList
|
try
|
||||||
|
{
|
||||||
|
FixedRemoteFileList
|
||||||
(
|
(
|
||||||
m_pContext->m_DeCompressionBuffer.GetBuffer(0),
|
m_pContext->m_DeCompressionBuffer.GetBuffer(0),
|
||||||
m_pContext->m_DeCompressionBuffer.GetBufferLen() - 1
|
m_pContext->m_DeCompressionBuffer.GetBufferLen() - 1
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
catch (CMemoryException* e)
|
||||||
|
{
|
||||||
|
OutputDebugStringA("[ERROR] CMemoryException\n");
|
||||||
|
}
|
||||||
|
catch (CFileException* e)
|
||||||
|
{
|
||||||
|
OutputDebugStringA("[ERROR] CFileException\n");
|
||||||
|
}
|
||||||
|
catch (CException* e)
|
||||||
|
{
|
||||||
|
OutputDebugStringA("[ERROR] CException\n");
|
||||||
|
}
|
||||||
|
catch (...) {
|
||||||
|
OutputDebugStringA("[ERROR] Other exception\n");
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case TOKEN_FILE_SIZE: // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʱ<EFBFBD>ĵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ݰ<EFBFBD><DDB0><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
|
case TOKEN_FILE_SIZE: // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʱ<EFBFBD>ĵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ݰ<EFBFBD><DDB0><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
|
||||||
CreateLocalRecvFile();
|
CreateLocalRecvFile();
|
||||||
@@ -2092,7 +2110,6 @@ void CFileManagerDlg::SendFileData()
|
|||||||
ReadFile(hFile, lpBuffer + nHeadLength, nNumberOfBytesToRead, &nNumberOfBytesRead, NULL);
|
ReadFile(hFile, lpBuffer + nHeadLength, nNumberOfBytesToRead, &nNumberOfBytesRead, NULL);
|
||||||
CloseHandle(hFile);
|
CloseHandle(hFile);
|
||||||
|
|
||||||
|
|
||||||
if (nNumberOfBytesRead > 0)
|
if (nNumberOfBytesRead > 0)
|
||||||
{
|
{
|
||||||
int nPacketSize = nNumberOfBytesRead + nHeadLength;
|
int nPacketSize = nNumberOfBytesRead + nHeadLength;
|
||||||
|
|||||||
@@ -510,6 +510,7 @@ BOOL IOCPServer::OnClientReceiving(PCONTEXT_OBJECT ContextObject, DWORD dwTrans
|
|||||||
PostRecv(ContextObject); //Ͷ<><CDB6><EFBFBD>µĽ<C2B5><C4BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><DDB5><EFBFBD><EFBFBD><EFBFBD>
|
PostRecv(ContextObject); //Ͷ<><CDB6><EFBFBD>µĽ<C2B5><C4BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><DDB5><EFBFBD><EFBFBD><EFBFBD>
|
||||||
}catch(...)
|
}catch(...)
|
||||||
{
|
{
|
||||||
|
OutputDebugStringA("[ERROR] OnClientReceiving catch an error \n");
|
||||||
ContextObject->InCompressedBuffer.ClearBuffer();
|
ContextObject->InCompressedBuffer.ClearBuffer();
|
||||||
ContextObject->InDeCompressedBuffer.ClearBuffer();
|
ContextObject->InDeCompressedBuffer.ClearBuffer();
|
||||||
|
|
||||||
@@ -572,7 +573,9 @@ VOID IOCPServer::OnClientPreSending(CONTEXT_OBJECT* ContextObject, PBYTE szBuffe
|
|||||||
RemoveStaleContext(ContextObject);
|
RemoveStaleContext(ContextObject);
|
||||||
SAFE_DELETE(OverlappedPlus);
|
SAFE_DELETE(OverlappedPlus);
|
||||||
}
|
}
|
||||||
}catch(...){}
|
}catch(...){
|
||||||
|
OutputDebugStringA("[ERROR] OnClientPreSending catch an error \n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL IOCPServer::OnClientPostSending(CONTEXT_OBJECT* ContextObject,ULONG ulCompletedLength)
|
BOOL IOCPServer::OnClientPostSending(CONTEXT_OBJECT* ContextObject,ULONG ulCompletedLength)
|
||||||
@@ -603,7 +606,9 @@ BOOL IOCPServer::OnClientPostSending(CONTEXT_OBJECT* ContextObject,ULONG ulCompl
|
|||||||
SAFE_DELETE(OverlappedPlus);
|
SAFE_DELETE(OverlappedPlus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}catch(...){}
|
}catch(...){
|
||||||
|
OutputDebugStringA("[ERROR] OnClientPostSending catch an error \n");
|
||||||
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user