准备分布v1.0.0.3

修复语音监听对话框显示已收到数据不更新状态的问题。
发现"发送本地语音"会导致主控端容易崩溃的问题，现象类似于操作远程桌面时的随机崩溃。

.gitignore

@@ -67,3 +67,4 @@ server/2015Remote/2015Remote.aps
 server/2015Remote.VC.db
 server/2015Remote.opensdf
 *.7z
+*.ini

ReadMe.txt

@@ -109,3 +109,47 @@
 1、整理部分垃圾代码。
 
 2、发布V1.0.0.2。
+
+2018.1.19
+
+1、发现使用lz4压缩库时监控端程序进行远程桌面操作时容易崩溃，原因不明。
+
+2、修复内存泄漏缺陷，在throw "Bad Buffer"的情况需要释放申请的内存。
+
+2019.1.20
+
+1、发现不管是采用zstd还是zlib，主控端在进行桌面控制时均有崩溃的几率（zlib较小）。
+
+2、改用zlib压缩解压库。
+
+3、完善追踪鼠标时鼠标形态变化时的展现效果。
+
+4、当退出远程桌面窗口全屏状态时，不再向远程被控端发送F11。
+
+5、发现在有线网络条件下主控端崩溃几率较小。
+
+6、禁用主控端输入法，解决使用远程桌面在被控端输入时的麻烦问题。
+
+2019.1.21
+
+减少远程桌面new缓冲区的频率，将部分从堆上new固定内存的操作改用从栈上分配内存。
+
+2019.1.22
+
+减少音频视频捕获过程中频繁申请内存。
+
+2019.1.25
+
+1、修复被控端消息提示对话框在消息换行时显示不完整的问题。
+
+2、添加/完善录制远程被控端视频的功能。
+
+3、修复语音监听对话框显示已收到数据不更新状态的问题。
+
+4、发现"发送本地语音"会导致主控端容易崩溃的问题，现象类似于操作远程桌面时的随机崩溃。
+
+5、设置视频监控对话框为可调整大小，为其设置图标。
+
+2019.1.26
+
+发布V1.0.0.3。

client/Audio.cpp

@@ -147,10 +147,7 @@ LPBYTE CAudio::GetRecordBuffer(LPDWORD dwBufferSize)
 	{
 		return NULL;
 	}	
-	if (dwBufferSize == NULL)
-	{
-		return NULL;
-	}	
+
 	SetEvent(m_hStartRecord);
 	WaitForSingleObject(m_hEventWaveIn, INFINITE);
 	*dwBufferSize = m_ulBufferLength;

client/AudioManager.cpp

@@ -31,6 +31,7 @@ CAudioManager::CAudioManager(IOCPClient* ClientObject, int n):CManager(ClientObj
 	m_ClientObject->OnServerSending((char*)&bToken, 1);  
 
 	WaitForDialogOpen();    //<2F>ȴ<EFBFBD><C8B4>Ի<EFBFBD><D4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	szPacket = NULL;
 
 	m_hWorkThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)WorkThread,
 		(LPVOID)this, 0, NULL);
@@ -43,12 +44,13 @@ VOID  CAudioManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
 	{
 	case COMMAND_NEXT:
 		{
-			NotifyDialogIsOpen();   
+			if (1 == ulLength)
+				NotifyDialogIsOpen();
 			break;
 		}
 	default:
-		{		
-			m_AudioObject->PlayBuffer(szBuffer, ulLength);      
+		{
+			m_AudioObject->PlayBuffer(szBuffer, ulLength);
 			break;
 		}
 	}
@@ -77,17 +79,17 @@ BOOL CAudioManager::SendRecordBuffer()
 	if (szBuffer == NULL)
 		return 0;
 	//<2F><><EFBFBD>仺<EFBFBD><E4BBBA><EFBFBD><EFBFBD>
-	LPBYTE	szPacket = new BYTE[dwBufferSize + 1];
+	szPacket = szPacket ? szPacket : new BYTE[dwBufferSize + 1];
 	//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ
 	szPacket[0] = TOKEN_AUDIO_DATA;     //<2F><><EFBFBD><EFBFBD><EFBFBD>ض˷<D8B6><CBB7>͸<EFBFBD><CDB8><EFBFBD>Ϣ
 	//<2F><><EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD><EFBFBD>
 	memcpy(szPacket + 1, szBuffer, dwBufferSize);
+	szPacket[dwBufferSize] = 0;
 	//<2F><><EFBFBD>ͳ<EFBFBD>ȥ
 	if (dwBufferSize > 0)
 	{
 		dwReturn = m_ClientObject->OnServerSending((char*)szPacket, dwBufferSize + 1);  	
 	}
-	delete	szPacket;   
 	return dwReturn;	
 }
 
@@ -103,6 +105,11 @@ CAudioManager::~CAudioManager()
 		delete m_AudioObject;
 		m_AudioObject = NULL;
 	}
+	if (szPacket)
+	{
+		delete [] szPacket;
+		szPacket = NULL;
+	}
 	printf("~CAudioManager %x\n", this);
 }
 

client/AudioManager.h

@@ -26,6 +26,7 @@ public:
 	BOOL SendRecordBuffer();
 
 	CAudio*  m_AudioObject;
+	LPBYTE	szPacket; // <20><>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 };
 
 #endif // !defined(AFX_AUDIOMANAGER_H__B47ECAB3_9810_4031_9E2E_BC34825CAD74__INCLUDED_)

client/CaptureVideo.cpp

@@ -12,18 +12,20 @@ CSampleGrabberCB mCB;
 
 CCaptureVideo::CCaptureVideo()
 {
-	if(FAILED(CoInitialize(NULL)))   
+	if(FAILED(CoInitialize(NULL)))
 	{
 		return;
 	}
 	m_pCapture = NULL;
 	m_pGB = NULL;
 	m_pMC = NULL;
-	m_pVW = NULL;  
+	m_pVW = NULL;
+	m_bExit = FALSE;
 }
 
 CCaptureVideo::~CCaptureVideo()
 {
+	m_bExit = TRUE;
 	if(m_pMC)m_pMC->StopWhenReady();
 	if(m_pVW){
 		m_pVW->put_Visible(OAFALSE);
@@ -55,7 +57,7 @@ HRESULT CCaptureVideo::Open(int iDeviceID,int iPress)
 		hResult = m_pGB->AddFilter(m_pBF, L"Capture Filter");
 
 		hResult = CoCreateInstance(CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, 
-			IID_ISampleGrabber, (void**)&m_pGrabber);   //<2F><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD>   
+			IID_ISampleGrabber, (void**)&m_pGrabber);   //<2F><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD>
 		if(FAILED(hResult))
 			break;
 
@@ -258,10 +260,9 @@ LPBYTE CCaptureVideo::GetDIB(DWORD& dwSize)
 	{
 		if (mCB.bStact==CMD_CAN_SEND)      //<2F><><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1><EFBFBD>һ<EFBFBD>·<EFBFBD><C2B7>͵<EFBFBD>״̬
 		{
-			szBuffer = mCB.GetNextScreen(dwSize);//ͨ<><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ij<EFBFBD>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD><C3B5><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD><EFBFBD>Ǽ<EFBFBD><C7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			szBuffer = mCB.GetNextScreen(dwSize);
 		}
-	} while (szBuffer==NULL);
-
+	} while (szBuffer==NULL && !m_bExit);
 
 	return szBuffer;
 }

client/CaptureVideo.h

@@ -36,7 +36,7 @@ public:
 	LPBITMAPINFO m_BitmapInfor_Full;
 	BYTE*        m_BitmapData_Full;
 	BOOL         bStact; 
-	DWORD        m_dwSize;
+	DWORD        m_dwSize; // <20><>Ƶͼ<C6B5><CDBC><EFBFBD><EFBFBD><EFBFBD>ݴ<EFBFBD>С
 
 	CSampleGrabberCB()
 	{
@@ -152,6 +152,7 @@ public:
 	}
 };
 
+extern CSampleGrabberCB mCB;
 
 class CCaptureVideo  
 {
@@ -165,6 +166,10 @@ public:
 
 	LPBYTE GetDIB(DWORD& dwSize);
 
+	int GetDIBBufSize() const { return mCB.m_dwSize; }
+
+	BOOL		m_bExit;
+
 	HWND      m_hWnd;
 
 	IGraphBuilder *    m_pGB;   //ͨ<><CDA8><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Է<EFBFBD><D4B7><EFBFBD> FCDO   Filter Control Device Object

client/ClientDll.vcxproj

@@ -83,7 +83,6 @@
     <ClCompile Include="CaptureVideo.cpp" />
     <ClCompile Include="ClientDll.cpp" />
     <ClCompile Include="Common.cpp" />
-    <ClCompile Include="CursorInfor.cpp" />
     <ClCompile Include="FileManager.cpp" />
     <ClCompile Include="IOCPClient.cpp" />
     <ClCompile Include="KernelManager.cpp" />
@@ -106,7 +105,7 @@
     <ClInclude Include="Buffer.h" />
     <ClInclude Include="CaptureVideo.h" />
     <ClInclude Include="Common.h" />
-    <ClInclude Include="CursorInfor.h" />
+    <ClInclude Include="CursorInfo.h" />
     <ClInclude Include="FileManager.h" />
     <ClInclude Include="IOCPClient.h" />
     <ClInclude Include="KernelManager.h" />
@@ -138,6 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="Res\ghost.ico" />
+    <Image Include="Res\msg.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

client/ClientDll.vcxproj.filters

@@ -33,9 +33,6 @@
     <ClCompile Include="Common.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="CursorInfor.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="FileManager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -98,9 +95,6 @@
     <ClInclude Include="Common.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="CursorInfor.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="FileManager.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -158,6 +152,9 @@
     <ClInclude Include="zlib.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="CursorInfo.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Script.rc">
@@ -178,5 +175,8 @@
     <Image Include="Res\ghost.ico">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="Res\msg.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>

client/CursorInfo.h

@@ -0,0 +1,85 @@
+// CursorInfor.h: interface for the CCursorInfor class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_)
+#define AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define MAX_CURSOR_TYPE	16
+
+class CCursorInfo
+{
+private:
+	LPCTSTR	m_CursorResArray[MAX_CURSOR_TYPE];
+	HCURSOR	m_CursorHandleArray[MAX_CURSOR_TYPE];
+
+public:
+	CCursorInfo()
+	{
+		LPCTSTR	CursorResArray[MAX_CURSOR_TYPE] = 
+		{
+			IDC_APPSTARTING,
+			IDC_ARROW,
+			IDC_CROSS,
+			IDC_HAND,
+			IDC_HELP,
+			IDC_IBEAM,
+			IDC_ICON,
+			IDC_NO,
+			IDC_SIZE,
+			IDC_SIZEALL,
+			IDC_SIZENESW,
+			IDC_SIZENS,
+			IDC_SIZENWSE,
+			IDC_SIZEWE,
+			IDC_UPARROW,
+			IDC_WAIT
+		};
+
+		for (int i = 0; i < MAX_CURSOR_TYPE; ++i)
+		{
+			m_CursorResArray[i] = CursorResArray[i];
+			m_CursorHandleArray[i] = LoadCursor(NULL, CursorResArray[i]);
+		}
+	}
+
+	virtual ~CCursorInfo()
+	{
+		for (int i = 0; i < MAX_CURSOR_TYPE; ++i)
+			DestroyCursor(m_CursorHandleArray[i]);
+	}
+
+	int getCurrentCursorIndex()
+	{
+		CURSORINFO	ci;
+		ci.cbSize = sizeof(CURSORINFO);
+		if (!GetCursorInfo(&ci) || ci.flags != CURSOR_SHOWING)
+			return -1;
+
+		int i;
+		for (i = 0; i < MAX_CURSOR_TYPE; ++i)
+		{
+			if (ci.hCursor == m_CursorHandleArray[i])
+				break;
+		}
+		DestroyCursor(ci.hCursor);
+
+		int	nIndex = i == MAX_CURSOR_TYPE ? -1 : i;
+		return nIndex;
+	}
+
+	HCURSOR getCursorHandle( int nIndex )
+	{
+		if (nIndex >= 0 && nIndex < MAX_CURSOR_TYPE)
+			return	m_CursorHandleArray[nIndex];
+		else
+			return NULL;
+	}
+};
+
+
+#endif // !defined(AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_)

client/CursorInfor.cpp

@@ -1,40 +0,0 @@
-// CursorInfor.cpp: implementation of the CCursorInfor class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include "CursorInfor.h"
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-CCursorInfor::CCursorInfor()
-{
-
-}
-
-CCursorInfor::~CCursorInfor()
-{
-
-}
-
-int CCursorInfor::GetCurrentCursorIndex()
-{
-	CURSORINFO	ci;
-	ci.cbSize = sizeof(CURSORINFO);
-	if (!GetCursorInfo(&ci) || ci.flags != CURSOR_SHOWING)
-	{
-		return -1;
-	}
-	
-	int iIndex = 0;
-	for (iIndex = 0; iIndex < MAX_CURSOR_TYPE; iIndex++)
-	{
-		break;
-	}
-	DestroyCursor(ci.hCursor);
-	
-	return iIndex == MAX_CURSOR_TYPE ? -1 : iIndex;
-}

client/CursorInfor.h

@@ -1,22 +0,0 @@
-// CursorInfor.h: interface for the CCursorInfor class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_)
-#define AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define MAX_CURSOR_TYPE 16
-class CCursorInfor  
-{
-public:
-	CCursorInfor();
-	virtual ~CCursorInfor();
-
-	int GetCurrentCursorIndex();
-};
-
-#endif // !defined(AFX_CURSORINFOR_H__ABC3705B_9461_4A94_B825_26539717C0D6__INCLUDED_)

client/IOCPClient.cpp

@@ -253,6 +253,8 @@ VOID IOCPClient::OnServerReceiving(char* szBuffer, ULONG ulLength)
 				}
 				else{
 					printf("[ERROR] uncompress failed \n");
+					delete [] CompressedBuffer;
+					delete [] DeCompressedBuffer;
 					throw "Bad Buffer";
 				}
 

client/RegisterOperation.cpp

@@ -86,7 +86,6 @@ char* RegisterOperation::FindPath()
 		if(KeyCount>0&&KeySize>1){
 			int Size=sizeof(REGMSG)+1;
 
-			//buf=new char[KeyCnt*KeySize+size+1];
 			DWORD DataSize=KeyCount*KeySize+Size+1;    //[TOKEN_REG_PATH][2 11 ccccc\0][11][11]
 			szBuffer=(char*)LocalAlloc(LPTR, DataSize);
 			ZeroMemory(szBuffer,DataSize);

client/ScreenManager.cpp

@@ -28,6 +28,8 @@ CScreenManager::CScreenManager(IOCPClient* ClientObject, int n):CManager(ClientO
 
 	m_ScreenSpyObject = new CScreenSpy(16);
 
+	szBuffer = new char[4 * m_ScreenSpyObject->m_ulFullWidth * m_ScreenSpyObject->m_ulFullHeight];
+
 	m_hWorkThread = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)WorkThreadProc,this,0,NULL);
 }
 
@@ -43,7 +45,13 @@ DWORD WINAPI CScreenManager::WorkThreadProc(LPVOID lParam)
 
 	clock_t last = clock();
 	This->SendFirstScreen();
-	const int fps = 12;// ֡<><D6A1>
+#if USING_ZLIB
+	const int fps = 8;// ֡<><D6A1>
+#elif USING_LZ4
+	const int fps = 8;// ֡<><D6A1>
+#else
+	const int fps = 8;// ֡<><D6A1>
+#endif
 	const int sleep = 1000 / fps;// <20><><EFBFBD><EFBFBD>ʱ<EFBFBD>䣨ms<6D><73>
 	timeBeginPeriod(1);
 	while (This->m_bIsWorking)
@@ -58,8 +66,6 @@ DWORD WINAPI CScreenManager::WorkThreadProc(LPVOID lParam)
 				printf("SendScreen Span = %d ms\n", span);
 			last = clock();
 			This->SendNextScreen(szBuffer, ulNextSendLength);
-			delete[] szBuffer;
-			szBuffer = NULL;
 		}
 	}
 	timeEndPeriod(1);
@@ -96,6 +102,11 @@ CScreenManager::~CScreenManager()
 
 	delete[] m_ScreenSpyObject;
 	m_ScreenSpyObject = NULL;
+	if(szBuffer)
+	{
+		delete [] szBuffer;
+		szBuffer = NULL;
+	}
 }
 
 VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
@@ -189,16 +200,12 @@ VOID CScreenManager::SendFirstScreen()
 	}
 
 	ULONG	ulFirstSendLength = 1 + m_ScreenSpyObject->GetFirstScreenLength();
-	LPBYTE	szBuffer = new BYTE[ulFirstSendLength];
 
 	szBuffer[0] = TOKEN_FIRSTSCREEN;
 	memcpy(szBuffer + 1, FirstScreenData, ulFirstSendLength - 1);
 
 	m_ClientObject->OnServerSending((char*)szBuffer, ulFirstSendLength);
-
-	delete [] szBuffer;
-
-	szBuffer = NULL;
+	szBuffer[ulFirstSendLength] = 0;
 }
 
 const char* CScreenManager::GetNextScreen(ULONG &ulNextSendLength)
@@ -212,10 +219,9 @@ const char* CScreenManager::GetNextScreen(ULONG &ulNextSendLength)
 
 	ulNextSendLength += 1;
 
-	char*	szBuffer = new char[ulNextSendLength];
-
 	szBuffer[0] = TOKEN_NEXTSCREEN;
 	memcpy(szBuffer + 1, NextScreenData, ulNextSendLength - 1);
+	szBuffer[ulNextSendLength] = 0;
 
 	return szBuffer;
 }

client/ScreenManager.h

@@ -17,6 +17,7 @@ class IOCPClient;
 class CScreenManager : public CManager  
 {
 public:
+	char*	szBuffer;
 	CScreenManager(IOCPClient* ClientObject, int n);
 	virtual ~CScreenManager();
 	HANDLE  m_hWorkThread;

client/ScreenSpy.cpp

@@ -156,7 +156,7 @@ LPVOID CScreenSpy::GetNextScreenData(ULONG* ulNextSendLength)
 	WriteRectBuffer((LPBYTE)&CursorPos, sizeof(POINT));
 
 	// д<>뵱ǰ<EBB5B1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	BYTE	bCursorIndex = m_CursorInfor.GetCurrentCursorIndex();
+	BYTE	bCursorIndex = m_CursorInfor.getCurrentCursorIndex();
 	WriteRectBuffer(&bCursorIndex, sizeof(BYTE));
 
 	// <20><><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD>㷨

client/ScreenSpy.h

@@ -10,7 +10,7 @@
 #endif // _MSC_VER > 1000
 #define ALGORITHM_DIFF 1
 #define COPY_ALL 1	// <20><><EFBFBD><EFBFBD>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>ֿ鿽<D6BF><E9BFBD><EFBFBD><EFBFBD>added by yuanyuanxiang 2019-1-7<><37>
-#include "CursorInfor.h"
+#include "CursorInfo.h"
 
 
 class CScreenSpy  
@@ -61,7 +61,7 @@ public:
 		m_RectBufferOffset += ulLength;
 	}
 
-	CCursorInfor m_CursorInfor;
+	CCursorInfo m_CursorInfor;
 	HDC  m_hDiffMemDC;
 	HBITMAP	m_DiffBitmapHandle;
 	PVOID   m_DiffBitmapData_Full;

client/Script.rc

@@ -87,7 +87,7 @@ IDR_WAVE                WAVE                    "Res\\msg.wav"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,2
+ FILEVERSION 1,0,0,3
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -105,7 +105,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FUCK THE UNIVERSE"
             VALUE "FileDescription", "A GHOST"
-            VALUE "FileVersion", "1.0.0.2"
+            VALUE "FileVersion", "1.0.0.3"
             VALUE "InternalName", "ServerDl.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019-2025"
             VALUE "OriginalFilename", "ServerDl.dll"

client/StdAfx.h

@@ -7,7 +7,7 @@
 #define AFX_STDAFX_H__46CA6496_AAD6_4658_B6E9_D7AEB26CDCD5__INCLUDED_
 
 // <20>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>ZLIB
-#define USING_ZLIB 0
+#define USING_ZLIB 1
 
 #if !USING_ZLIB
 // <20>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>LZ4

client/TalkManager.cpp

@@ -15,7 +15,7 @@ using namespace std;
 #define ID_TIMER_DELAY_DISPLAY	2 
 #define ID_TIMER_CLOSE_WINDOW	3 
 
-#define WIN_WIDTH		250   
+#define WIN_WIDTH		360   
 #define WIN_HEIGHT		200
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -54,7 +54,6 @@ VOID CTalkManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
 		{
 			memcpy(g_Buffer, szBuffer, ulLength);
 			//<2F><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>DLG
-
 			DialogBox(g_hInstance,MAKEINTRESOURCE(IDD_DIALOG),
 				NULL,DialogProc);  //SDK   C   MFC  C++
 			break;
@@ -126,7 +125,7 @@ VOID CTalkManager::OnDlgTimer(HWND hDlg)   //ʱ
 			{
 				KillTimer(hDlg,ID_TIMER_CLOSE_WINDOW);
 				BYTE bToken = TOKEN_TALKCMPLT;				// <20><><EFBFBD><EFBFBD>ͷ<EFBFBD>ļ<EFBFBD> Common.h     
-				g_IOCPClientObject->OnServerSending((char*)&bToken, 1);		// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7>͵<EFBFBD>ָ<EFBFBD><D6B8>
+				g_IOCPClientObject->OnServerSending((char*)&bToken, 1); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7>͵<EFBFBD>ָ<EFBFBD><D6B8>
 				EndDialog(hDlg,0);
 			}
 			break;

client/TestRun.vcxproj.user

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <RemoteDebuggerCommand>C:\Users\win7\Desktop\Remoter\TestRun.exe</RemoteDebuggerCommand>
-    <RemoteDebuggerWorkingDirectory>C:\Users\win7\Desktop\Remoter</RemoteDebuggerWorkingDirectory>
+    <RemoteDebuggerCommand>C:\VM\Remoter\TestRun.exe</RemoteDebuggerCommand>
+    <RemoteDebuggerWorkingDirectory>C:\VM\Remoter</RemoteDebuggerWorkingDirectory>
     <RemoteDebuggerServerName>192.168.43.2</RemoteDebuggerServerName>
-    <DeploymentDirectory>C:\Users\win7\Desktop\Remoter</DeploymentDirectory>
+    <DeploymentDirectory>C:\VM\Remoter</DeploymentDirectory>
     <AdditionalFiles>$(TargetDir)\TestRun.pdb;$(TargetDir)\ServerDll.dll;$(TargetDir)\ServerDll.pdb</AdditionalFiles>
     <RemoteDebuggerDeployDebugCppRuntime>false</RemoteDebuggerDeployDebugCppRuntime>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

client/VideoManager.cpp

@@ -20,6 +20,7 @@ CVideoManager::CVideoManager(IOCPClient* ClientObject, int n) : CManager(ClientO
 	m_fccHandler = 1129730893;
 
 	m_CapVideo.Open(0,0);  // <20><><EFBFBD><EFBFBD>
+	lpBuffer = NULL;
 
 	m_hWorkThread = CreateThread(NULL, 0, 
 		(LPTHREAD_START_ROUTINE)WorkThread, this, 0, NULL);
@@ -34,22 +35,35 @@ DWORD CVideoManager::WorkThread(LPVOID lParam)
 	if (This->Initialize())          //ת<><D7AA>Initialize
 	{
 		This->m_bIsCompress=true;    //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD><C3BF><EFBFBD>ѹ<EFBFBD><D1B9>
+		printf("ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>.\n");
 	}
 
 	This->SendBitMapInfor();         //<2F><><EFBFBD><EFBFBD>bmpλͼ<CEBB>ṹ
+
 	// <20>ȿ<EFBFBD><C8BF>ƶ˶Ի<CBB6><D4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	This->WaitForDialogOpen();
+#if USING_ZLIB
+	const int fps = 8;// ֡<><D6A1>
+#elif USING_LZ4
+	const int fps = 8;// ֡<><D6A1>
+#else
+	const int fps = 8;// ֡<><D6A1>
+#endif
+	const int sleep = 1000 / fps;// <20><><EFBFBD><EFBFBD>ʱ<EFBFBD>䣨ms<6D><73>
 
-	This->WaitForDialogOpen();  
-
+	timeBeginPeriod(1);
 	while (This->m_bIsWorking)
 	{
 		// <20><><EFBFBD><EFBFBD><EFBFBD>ٶ<EFBFBD>
-		if ((GetTickCount() - dwLastScreen) < 150)
-			Sleep(100);
-
+		int span = sleep-(GetTickCount() - dwLastScreen);
+		Sleep(span > 0 ? span : 1);
+		if (span < 0)
+			printf("SendScreen Span = %d ms\n", span);
 		dwLastScreen = GetTickCount();
-		This->SendNextScreen(); //<2F><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>صĴ<D8B5><C4B4><EFBFBD><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD>ǵ<EFBFBD>sendNextScreen  <20><><EFBFBD><EFBFBD>
+		if(FALSE == This->SendNextScreen())
+			break;
 	}
+	timeEndPeriod(1);
 
 	This->Destroy();
 	std::cout<<"CVideoManager WorkThread end\n";
@@ -60,7 +74,7 @@ DWORD CVideoManager::WorkThread(LPVOID lParam)
 CVideoManager::~CVideoManager()
 {
 	InterlockedExchange((LPLONG)&m_bIsWorking, FALSE);
-
+	m_CapVideo.m_bExit = TRUE;
 	WaitForSingleObject(m_hWorkThread, INFINITE);
 	CloseHandle(m_hWorkThread);
 	std::cout<<"CVideoManager ~CVideoManager \n";
@@ -69,10 +83,13 @@ CVideoManager::~CVideoManager()
 		delete m_pVideoCodec;
 		m_pVideoCodec = NULL;
 	}
+	if (lpBuffer)
+		delete [] lpBuffer;
 }
 
 void CVideoManager::Destroy()
 {
+	m_bIsWorking = FALSE;
 	std::cout<<"CVideoManager Destroy \n";
 	if (m_pVideoCodec)   //ѹ<><D1B9><EFBFBD><EFBFBD>
 	{
@@ -83,29 +100,28 @@ void CVideoManager::Destroy()
 
 void CVideoManager::SendBitMapInfor()
 {
-	DWORD	dwBytesLength = 1 + sizeof(BITMAPINFO);
-	LPBYTE	szBuffer = new BYTE[dwBytesLength];
-	if (szBuffer == NULL)
-		return;
-
-	szBuffer[0] = TOKEN_WEBCAM_BITMAPINFO;   //+ ͷ
+	const int	dwBytesLength = 1 + sizeof(BITMAPINFO);
+	BYTE szBuffer[dwBytesLength + 3] = { 0 };
+	szBuffer[0] = TOKEN_WEBCAM_BITMAPINFO;
 	memcpy(szBuffer + 1, m_CapVideo.GetBmpInfor(), sizeof(BITMAPINFO));
-	m_ClientObject->OnServerSending((char*)szBuffer, dwBytesLength);	
-	delete [] szBuffer;		
+	m_ClientObject->OnServerSending((char*)szBuffer, dwBytesLength);
 }
 
-void CVideoManager::SendNextScreen()
+BOOL CVideoManager::SendNextScreen()
 {
 	DWORD dwBmpImageSize=0;
-	LPVOID	lpDIB =m_CapVideo.GetDIB(dwBmpImageSize); //m_pVideoCap->GetDIB();
-	// token + IsCompress + m_fccHandler + DIB
-	int		nHeadLen = 1 + 1 + 4;
+	LPVOID	lpDIB =m_CapVideo.GetDIB(dwBmpImageSize);
+	if(lpDIB == NULL)
+		return FALSE;
 
-	UINT	nBufferLen = nHeadLen + dwBmpImageSize;//m_pVideoCap->m_lpbmi->bmiHeader.biSizeImage;
-	LPBYTE	lpBuffer = new BYTE[nBufferLen];
+	// token + IsCompress + m_fccHandler + DIB
+	const int nHeadLen = 1 + 1 + 4;
+
+	UINT	nBufferLen = nHeadLen + dwBmpImageSize;
+	lpBuffer = lpBuffer ? lpBuffer : new BYTE[nBufferLen];
 
 	lpBuffer[0] = TOKEN_WEBCAM_DIB;
-	lpBuffer[1] = m_bIsCompress;   //ѹ<><D1B9>  
+	lpBuffer[1] = m_bIsCompress;   //ѹ<><D1B9>
 
 	memcpy(lpBuffer + 2, &m_fccHandler, sizeof(DWORD));     //<2F><><EFBFBD>ｫ<EFBFBD><EFBDAB>Ƶѹ<C6B5><D1B9><EFBFBD><EFBFBD>д<EFBFBD><D0B4>Ҫ<EFBFBD><D2AA><EFBFBD>͵Ļ<CDB5><C4BB><EFBFBD><EFBFBD><EFBFBD>
 
@@ -113,15 +129,14 @@ void CVideoManager::SendNextScreen()
 	if (m_bIsCompress && m_pVideoCodec) //<2F><><EFBFBD><EFBFBD><EFBFBD>жϣ<D0B6><CFA3>Ƿ<EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD>ѹ<EFBFBD><D1B9>          
 	{
 		int	nCompressLen = 0;
-		//<2F><><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+		//<2F><><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		bool bRet = m_pVideoCodec->EncodeVideoData((LPBYTE)lpDIB, 
 			m_CapVideo.GetBmpInfor()->bmiHeader.biSizeImage, lpBuffer + nHeadLen, 
 			&nCompressLen, NULL);
 		if (!nCompressLen)
 		{
 			// some thing error
-			delete [] lpBuffer;
-			return;
+			return FALSE;
 		}
 		//<2F><><EFBFBD>¼<EFBFBD><C2BC>㷢<EFBFBD><E3B7A2><EFBFBD><EFBFBD><EFBFBD>ݰ<EFBFBD><DDB0>Ĵ<EFBFBD>С  ʣ<>¾<EFBFBD><C2BE>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ˣ<EFBFBD><CBA3><EFBFBD><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD>ض˿<D8B6>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>
 		//<2F><><EFBFBD><EFBFBD><EFBFBD>ض˵<D8B6>void CVideoDlg::OnReceiveComplete(void)
@@ -137,7 +152,7 @@ void CVideoManager::SendNextScreen()
 
 	m_ClientObject->OnServerSending((char*)lpBuffer, nPacketLen);
 
-	delete [] lpBuffer;
+	return TRUE;
 }
 
 
@@ -149,7 +164,21 @@ VOID CVideoManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
 		{
 			NotifyDialogIsOpen();
 			break;
-		}	
+		}
+	case COMMAND_WEBCAM_ENABLECOMPRESS: // Ҫ<><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>
+		{
+			// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			if (m_pVideoCodec)
+				InterlockedExchange((LPLONG)&m_bIsCompress, true);
+			printf("ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>.\n");
+			break;
+		}
+	case COMMAND_WEBCAM_DISABLECOMPRESS: // ԭʼ<D4AD><CABC><EFBFBD>ݴ<EFBFBD><DDB4><EFBFBD>
+		{
+			InterlockedExchange((LPLONG)&m_bIsCompress, false);
+			printf("<EFBFBD><EFBFBD>ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>.\n");
+			break;
+		}
 	}
 }
 

client/VideoManager.h

@@ -23,7 +23,7 @@ public:
 	HANDLE m_hWorkThread;
 
 	void SendBitMapInfor();
-	void SendNextScreen();
+	BOOL SendNextScreen();
 	static DWORD WorkThread(LPVOID lParam);
 
 	CCaptureVideo  m_CapVideo;
@@ -32,6 +32,7 @@ public:
 
 	DWORD	m_fccHandler;
 	bool    m_bIsCompress;
+	LPBYTE  lpBuffer; // ץͼ<D7A5><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 	CVideoCodec	*m_pVideoCodec;   //ѹ<><D1B9><EFBFBD><EFBFBD>
 	void Destroy();

client/ghost.vcxproj

@@ -88,7 +88,6 @@
     <ClCompile Include="CaptureVideo.cpp" />
     <ClCompile Include="ClientDll.cpp" />
     <ClCompile Include="Common.cpp" />
-    <ClCompile Include="CursorInfor.cpp" />
     <ClCompile Include="FileManager.cpp" />
     <ClCompile Include="IOCPClient.cpp" />
     <ClCompile Include="KernelManager.cpp" />
@@ -111,7 +110,7 @@
     <ClInclude Include="Buffer.h" />
     <ClInclude Include="CaptureVideo.h" />
     <ClInclude Include="Common.h" />
-    <ClInclude Include="CursorInfor.h" />
+    <ClInclude Include="CursorInfo.h" />
     <ClInclude Include="FileManager.h" />
     <ClInclude Include="IOCPClient.h" />
     <ClInclude Include="KernelManager.h" />

client/ghost.vcxproj.filters

@@ -33,9 +33,6 @@
     <ClCompile Include="Common.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="CursorInfor.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="FileManager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -98,9 +95,6 @@
     <ClInclude Include="Common.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="CursorInfor.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="FileManager.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -158,6 +152,9 @@
     <ClInclude Include="zlib.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="CursorInfo.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Script.rc">

server/2015Remote/2015Remote.vcxproj

@@ -196,6 +196,7 @@
     <Image Include="res\Bitmap_5.bmp" />
     <Image Include="res\toolbar1.bmp" />
     <Image Include="res\toolbar2.bmp" />
+    <Image Include="res\webcam.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

server/2015Remote/2015Remote.vcxproj.filters

@@ -305,5 +305,8 @@
     <Image Include="res\Bitmap_5.bmp">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="res\webcam.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>

server/2015Remote/2015RemoteDlg.cpp

@@ -815,11 +815,6 @@ VOID CMy2015RemoteDlg::Activate(int nPort,int nMaxConnection)
 {
 	m_iocpServer = new IOCPServer;                //<2F><>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-	if (m_iocpServer==NULL)
-	{
-		return;
-	}
-
 	if (m_iocpServer->StartServer(NotifyProc, OfflineProc, nPort)==FALSE)
 	{
 		OutputDebugStringA("======> StartServer Failed \n");
@@ -833,7 +828,7 @@ VOID CMy2015RemoteDlg::Activate(int nPort,int nMaxConnection)
 
 VOID CALLBACK CMy2015RemoteDlg::NotifyProc(CONTEXT_OBJECT* ContextObject)
 {
-	AUTO_TICK(5);
+	AUTO_TICK(20);
 	MessageHandle(ContextObject);
 }
 
@@ -1142,7 +1137,7 @@ LRESULT CMy2015RemoteDlg::OnOpenScreenSpyDialog(WPARAM wParam, LPARAM lParam)
 	CScreenSpyDlg	*Dlg = new CScreenSpyDlg(this,m_iocpServer, ContextObject);   //Send  s
 	// <20><><EFBFBD>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD>Ϊ׿<CEAA><D7BF>
 	Dlg->Create(IDD_DIALOG_SCREEN_SPY, GetDesktopWindow());
-	Dlg->ShowWindow(SW_SHOW);
+	Dlg->ShowWindow(SW_SHOWMAXIMIZED);
 
 	ContextObject->v1   = SCREENSPY_DLG;
 	ContextObject->hDlg = Dlg;

server/2015Remote/Audio.cpp

@@ -33,8 +33,7 @@ CAudio::CAudio()
 
 	m_ulBufferLength = 1000;
 
-	int i = 0;
-	for (i = 0; i < 2; ++i)
+	for (int i = 0; i < 2; ++i)
 	{
 		m_InAudioData[i] = new BYTE[m_ulBufferLength];
 		m_InAudioHeader[i] =  new WAVEHDR;

server/2015Remote/AudioDlg.cpp

@@ -46,6 +46,7 @@ void CAudioDlg::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(CAudioDlg, CDialog)
 	ON_WM_CLOSE()
+	ON_BN_CLICKED(IDC_CHECK, &CAudioDlg::OnBnClickedCheck)
 END_MESSAGE_MAP()
 
 
@@ -70,6 +71,9 @@ BOOL CAudioDlg::OnInitDialog()
 
 	m_bThreadRun = m_hWorkThread ? TRUE : FALSE;
 
+	// "<22><><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"<22>ᵼ<EFBFBD>±<EFBFBD><C2B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"OnBnClickedCheck"
+	GetDlgItem(IDC_CHECK)->EnableWindow(FALSE);
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// <20>쳣: OCX <20><><EFBFBD><EFBFBD>ҳӦ<D2B3><D3A6><EFBFBD><EFBFBD> FALSE
 }
@@ -82,7 +86,7 @@ DWORD  CAudioDlg::WorkThread(LPVOID lParam)
 	{
 		if (!This->m_bSend)
 		{
-			Sleep(50);
+			WAIT(This->m_bIsWorking, 1, 50);
 			continue;
 		}
 		DWORD	dwBufferSize = 0;
@@ -101,12 +105,11 @@ void CAudioDlg::OnReceiveComplete(void)
 	m_nTotalRecvBytes += m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1;   //1000+ =1000 1
 	CString	strString;
 	strString.Format("Receive %d KBytes", m_nTotalRecvBytes / 1024);
-	SetDlgItemText(IDC_TIP, strString);
+	SetDlgItemText(IDC_TIPS, strString);
 	switch (m_ContextObject->InDeCompressedBuffer.GetBuffer(0)[0])
 	{
 	case TOKEN_AUDIO_DATA:
 		{
-
 			m_AudioObject.PlayBuffer(m_ContextObject->InDeCompressedBuffer.GetBuffer(1), 
 				m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1);   //<2F><><EFBFBD>Ų<EFBFBD><C5B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 			break;
@@ -134,3 +137,14 @@ void CAudioDlg::OnClose()
 	delete this;
 #endif
 }
+
+// <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6>
+void CAudioDlg::OnBnClickedCheck()
+{
+	// @notice 2019.1.26
+	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"<22><><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"<22><><EFBFBD>򱻿ض˱<D8B6><CBB1><EFBFBD><EFBFBD><EFBFBD>zlib inffas32.asm
+	// <20>轫<EFBFBD><E8BDAB><EFBFBD>ض<EFBFBD>zlib<69><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD><D8B6><EFBFBD><EFBFBD>±<EFBFBD><C2B1><EFBFBD>
+	// <20><><EFBFBD>Ǽ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD><D8B6>ڿ<EFBFBD><DABF><EFBFBD>"<22><><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"ʱ<><CAB1><EFBFBD>ױ<EFBFBD><D7B1><EFBFBD>
+	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	UpdateData(true);
+}

server/2015Remote/AudioDlg.h

@@ -33,7 +33,8 @@ protected:
 
 	DECLARE_MESSAGE_MAP()
 public:
-	BOOL m_bSend;
+	BOOL m_bSend; // <20>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ͱ<EFBFBD><CDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6>
 	virtual BOOL OnInitDialog();
 	afx_msg void OnClose();
+	afx_msg void OnBnClickedCheck();
 };

server/2015Remote/CpuUseage.cpp

@@ -12,7 +12,8 @@ CCpuUsage::CCpuUsage()
 CCpuUsage::~CCpuUsage()
 {
 	PdhCloseQuery(m_hQuery);   //<2F>رռ<D8B1><D5BC><EFBFBD><EFBFBD><EFBFBD>
-	delete m_pCounterStruct;
+	if (m_pCounterStruct)
+		delete m_pCounterStruct;
 }
 
 

server/2015Remote/FileManagerDlg.cpp

@@ -43,7 +43,7 @@ CFileManagerDlg::CFileManagerDlg(CWnd* pParent, CIOCPServer* pIOCPServer, Client
 		sizeof(SHFILEINFO), 
 		SHGFI_ICON | SHGFI_USEFILEATTRIBUTES
 		);
-	m_hIcon = sfi.hIcon;
+	m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_FATHER));
 	// <20><><EFBFBD><EFBFBD>ϵͳͼ<CDB3><CDBC><EFBFBD>б<EFBFBD>
 	static HIMAGELIST hImageList_Large = (HIMAGELIST)SHGetFileInfo
 		(

server/2015Remote/IOCPServer.cpp

@@ -69,6 +69,7 @@ IOCPServer::IOCPServer(void)
 
 	m_hKillEvent = NULL;
 
+	memset(m_szPacketFlag, 0, sizeof(m_szPacketFlag));
 	memcpy(m_szPacketFlag,"Shine",FLAG_LENGTH);
 
 	m_NotifyProc = NULL;
@@ -331,6 +332,7 @@ DWORD IOCPServer::WorkThreadProc(LPVOID lParam)
 			if (ContextObject && This->m_bTimeToKill == FALSE &&dwTrans==0)
 			{
 				ContextObject->olps = NULL;
+				OutputDebugStringA("!!! RemoveStaleContext \n");
 				This->RemoveStaleContext(ContextObject);
 			}
 			SAFE_DELETE(OverlappedPlus);
@@ -403,7 +405,7 @@ DWORD IOCPServer::WorkThreadProc(LPVOID lParam)
 //<2F>ڹ<EFBFBD><DAB9><EFBFBD><EFBFBD>߳<EFBFBD><DFB3>б<EFBFBD><D0B1><EFBFBD><EFBFBD><EFBFBD>
 BOOL IOCPServer::HandleIO(IOType PacketFlags,PCONTEXT_OBJECT ContextObject, DWORD dwTrans)
 {
-	AUTO_TICK(5);
+	AUTO_TICK(20);
 
 	BOOL bRet = FALSE;
 
@@ -479,6 +481,8 @@ BOOL IOCPServer::OnClientReceiving(PCONTEXT_OBJECT  ContextObject, DWORD dwTrans
 					m_NotifyProc(ContextObject);  //֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD>
 				}else{
 					OutputDebugStringA("[ERROR] uncompress failed \n");
+					delete [] CompressedBuffer;
+					delete [] DeCompressedBuffer;
 					throw "Bad Buffer";
 				}
 				delete [] CompressedBuffer;
@@ -528,7 +532,7 @@ VOID IOCPServer::OnClientPreSending(CONTEXT_OBJECT* ContextObject, PBYTE szBuffe
 			ULONG ulPackTotalLength = ulCompressedLength + HDR_LENGTH;
 			ContextObject->OutCompressedBuffer.WriteBuffer((LPBYTE)m_szPacketFlag,FLAG_LENGTH);
 			ContextObject->OutCompressedBuffer.WriteBuffer((PBYTE)&ulPackTotalLength, sizeof(ULONG));
-			ContextObject->OutCompressedBuffer.WriteBuffer((PBYTE) &ulOriginalLength, sizeof(ULONG));
+			ContextObject->OutCompressedBuffer.WriteBuffer((PBYTE)&ulOriginalLength, sizeof(ULONG));
 			ContextObject->OutCompressedBuffer.WriteBuffer(CompressedBuffer, ulCompressedLength);
 			delete [] CompressedBuffer;
 		}
@@ -536,7 +540,9 @@ VOID IOCPServer::OnClientPreSending(CONTEXT_OBJECT* ContextObject, PBYTE szBuffe
 		OVERLAPPEDPLUS* OverlappedPlus = new OVERLAPPEDPLUS(IOWrite);
 		BOOL bOk = PostQueuedCompletionStatus(m_hCompletionPort, 0, (DWORD)ContextObject, &OverlappedPlus->m_ol);
 		if ( (!bOk && GetLastError() != ERROR_IO_PENDING) )  //<2F><><EFBFBD><EFBFBD>Ͷ<EFBFBD><CDB6>ʧ<EFBFBD><CAA7>
-		{            
+		{
+			int a = GetLastError();
+			OutputDebugStringA("!!! OnClientPreSending Ͷ<><CDB6><EFBFBD><EFBFBD>Ϣʧ<CFA2><CAA7>\n");
 			RemoveStaleContext(ContextObject);
 			SAFE_DELETE(OverlappedPlus);
 		}
@@ -566,6 +572,7 @@ BOOL IOCPServer::OnClientPostSending(CONTEXT_OBJECT* ContextObject,ULONG ulCompl
 			if ( iOk == SOCKET_ERROR && WSAGetLastError() != WSA_IO_PENDING )
 			{
 				int a = GetLastError();
+				OutputDebugStringA("!!! OnClientPostSending Ͷ<><CDB6><EFBFBD><EFBFBD>Ϣʧ<CFA2><CAA7>\n");
 				RemoveStaleContext(ContextObject);
 				SAFE_DELETE(OverlappedPlus);
 			}
@@ -683,6 +690,8 @@ void IOCPServer::OnAccept()
 	//<2F><>Ϊ<EFBFBD><CEAA><EFBFBD>ǽ<EFBFBD><C7BD>ܵ<EFBFBD><DCB5><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>ߵ<EFBFBD><DFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ô<EFBFBD><C3B4><EFBFBD>Ǿͽ<C7BE><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD>ɶ˿<C9B6> <20><><EFBFBD><EFBFBD><EFBFBD>ǵĹ<C7B5><C4B9><EFBFBD><EFBFBD>̴߳<DFB3><CCB4><EFBFBD><EFBFBD><EFBFBD>
 	if ( (!bOk && GetLastError() != ERROR_IO_PENDING))  //<2F><><EFBFBD><EFBFBD>Ͷ<EFBFBD><CDB6>ʧ<EFBFBD><CAA7>
 	{
+		int a = GetLastError();
+		OutputDebugStringA("!!! OnAccept Ͷ<><CDB6><EFBFBD><EFBFBD>Ϣʧ<CFA2><CAA7>\n");
 		RemoveStaleContext(ContextObject);
 		SAFE_DELETE(OverlappedPlus);
 		return;
@@ -707,6 +716,7 @@ VOID IOCPServer::PostRecv(CONTEXT_OBJECT* ContextObject)
 	if (iOk == SOCKET_ERROR && WSAGetLastError() != WSA_IO_PENDING)
 	{
 		int a = GetLastError();
+		OutputDebugStringA("!!! PostRecv Ͷ<><CDB6><EFBFBD><EFBFBD>Ϣʧ<CFA2><CAA7>\n");
 		RemoveStaleContext(ContextObject);
 		SAFE_DELETE(OverlappedPlus);
 	}

server/2015Remote/IOCPServer.h

@@ -72,7 +72,7 @@ public:
 
 	ULONG  m_ulKeepLiveTime;
 
-	char   m_szPacketFlag[FLAG_LENGTH];
+	char   m_szPacketFlag[FLAG_LENGTH + 3];
 
 	typedef void (CALLBACK *pfnNotifyProc)(CONTEXT_OBJECT* ContextObject);
 	typedef void (CALLBACK *pfnOfflineProc)(CONTEXT_OBJECT* ContextObject);

server/2015Remote/ScreenSpyDlg.cpp

@@ -5,6 +5,7 @@
 #include "2015Remote.h"
 #include "ScreenSpyDlg.h"
 #include "afxdialogex.h"
+#include <imm.h>
 
 
 // CScreenSpyDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
@@ -28,6 +29,7 @@ IMPLEMENT_DYNAMIC(CScreenSpyDlg, CDialog)
 CScreenSpyDlg::CScreenSpyDlg(CWnd* Parent, IOCPServer* IOCPServer, CONTEXT_OBJECT* ContextObject)
 	: CDialog(CScreenSpyDlg::IDD, Parent)
 {
+	ImmDisableIME(0);// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뷨
 	m_bFullScreen = FALSE;
 
 	m_iocpServer	= IOCPServer;
@@ -37,7 +39,7 @@ CScreenSpyDlg::CScreenSpyDlg(CWnd* Parent, IOCPServer* IOCPServer, CONTEXT_OBJEC
 	GetSystemDirectory(szFullPath, MAX_PATH);
 	lstrcat(szFullPath, "\\shell32.dll");  //ͼ<><CDBC>
 	m_hIcon = ExtractIcon(AfxGetApp()->m_hInstance, szFullPath, 17);
-	m_hCursor = LoadCursor(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDC_ARROW));
+	m_hCursor = LoadCursor(AfxGetApp()->m_hInstance, MAKEINTRESOURCE(IDC_ARROWS));
 
 	sockaddr_in  ClientAddr;
 	memset(&ClientAddr, 0, sizeof(ClientAddr));
@@ -231,12 +233,13 @@ VOID CScreenSpyDlg::DrawNextScreenDiff(void)
 	}
 
 	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD>仯
-	BYTE bOldCursorIndex;
-	memcpy(&bOldCursorIndex, &m_bCursorIndex, sizeof(BYTE));
-	memcpy(&m_bCursorIndex, m_ContextObject->InDeCompressedBuffer.GetBuffer(2+sizeof(POINT)), sizeof(BYTE));
+	BYTE bOldCursorIndex = m_bCursorIndex;
+	m_bCursorIndex = m_ContextObject->InDeCompressedBuffer.GetBuffer(2+sizeof(POINT))[0];
 	if (bOldCursorIndex != m_bCursorIndex)
 	{
 		bChange = TRUE;
+		if (m_bIsCtrl && !m_bIsTraceCursor)//<2F>滻ָ<E6BBBB><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>WNDCLASSEX<45>ṹ
+			SetClassLong(m_hWnd, GCL_HCURSOR, (LONG)m_CursorInfo.getCursorHandle(m_bCursorIndex == (BYTE)-1 ? 1 : m_bCursorIndex));
 	}
 
 	// <20><>Ļ<EFBFBD>Ƿ<EFBFBD><C7B7>仯
@@ -298,7 +301,7 @@ void CScreenSpyDlg::OnPaint()
 		m_hFullDC,								
 		m_ClientCursorPos.x  - m_ulHScrollPos, 
 		m_ClientCursorPos.y  - m_ulVScrollPos,
-		m_hCursor,
+		m_CursorInfo.getCursorHandle(m_bCursorIndex == (BYTE)-1 ? 1 : m_bCursorIndex),
 		0,0,										
 		0,										
 		NULL,									
@@ -413,6 +416,8 @@ BOOL CScreenSpyDlg::PreTranslateMessage(MSG* pMsg)
 	case WM_KEYUP:
 	case WM_SYSKEYDOWN:
 	case WM_SYSKEYUP:
+		if (pMsg->wParam == VK_F11 && LeaveFullScreen()) // F11: <20>˳<EFBFBD>ȫ<EFBFBD><C8AB>
+			return TRUE;
 		if (pMsg->wParam != VK_LWIN && pMsg->wParam != VK_RWIN)
 		{
 			MSG	Msg;
@@ -423,9 +428,7 @@ BOOL CScreenSpyDlg::PreTranslateMessage(MSG* pMsg)
 			SendCommand(&Msg);
 		}
 		if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE)
-			return true;
-		if (pMsg->wParam == VK_F11) // <20>˳<EFBFBD>ȫ<EFBFBD><C8AB>
-			LeaveFullScreen();
+			return TRUE;// <20><><EFBFBD><EFBFBD>Enter<65><72>ESC<53>رնԻ<D5B6>
 		break;
 	}
 
@@ -438,12 +441,12 @@ VOID CScreenSpyDlg::SendCommand(MSG* Msg)
 	if (!m_bIsCtrl)
 		return;
 
-	LPBYTE szData = new BYTE[sizeof(MSG) + 1];
+	const int length = sizeof(MSG) + 1;
+	BYTE szData[length + 3];
 	szData[0] = COMMAND_SCREEN_CONTROL;
 	memcpy(szData + 1, Msg, sizeof(MSG));
-	m_iocpServer->OnClientPreSending(m_ContextObject, szData, sizeof(MSG) + 1);
-
-	delete[] szData;
+	szData[length] = 0;
+	m_iocpServer->OnClientPreSending(m_ContextObject, szData, length);
 }
 
 BOOL CScreenSpyDlg::SaveSnapshot(void)
@@ -647,8 +650,8 @@ void CScreenSpyDlg::EnterFullScreen()
 	}
 }
 
-
-void CScreenSpyDlg::LeaveFullScreen()
+// ȫ<><C8AB><EFBFBD>˳<EFBFBD><CBB3>ɹ<EFBFBD><C9B9>򷵻<EFBFBD>true
+bool CScreenSpyDlg::LeaveFullScreen()
 {
 	if (m_bFullScreen)
 	{
@@ -656,7 +659,9 @@ void CScreenSpyDlg::LeaveFullScreen()
 		CMenu *SysMenu = GetSystemMenu(FALSE);
 		SysMenu->CheckMenuItem(IDM_FULLSCREEN, MF_UNCHECKED); //<2F>˵<EFBFBD><CBB5><EFBFBD>ʽ
 		m_bFullScreen = false;
+		return true;
 	}
+	return false;
 }
 
 void CScreenSpyDlg::OnLButtonDown(UINT nFlags, CPoint point)

server/2015Remote/ScreenSpyDlg.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "IOCPServer.h"
+#include "..\..\client\CursorInfo.h"
 
 // CScreenSpyDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
 
@@ -34,6 +35,7 @@ public:
 	BYTE m_bCursorIndex;
 	CString  m_strClientIP;
 	BOOL     m_bIsTraceCursor;
+	CCursorInfo	m_CursorInfo; //<2F>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>ϵͳ<CFB5>Ĺ<EFBFBD><C4B9><EFBFBD><EFBFBD><EFBFBD>
 	VOID SendCommand(MSG* Msg);
 
 	VOID UpdateServerClipboard(char *szBuffer,ULONG ulLength);
@@ -53,7 +55,7 @@ public:
 	WINDOWPLACEMENT m_struOldWndpl;
 
 	void EnterFullScreen();
-	void LeaveFullScreen();
+	bool LeaveFullScreen();
 
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);

server/2015Remote/TalkDlg.cpp

@@ -25,6 +25,7 @@ void CTalkDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialog::DoDataExchange(pDX);
 	DDX_Control(pDX, IDC_EDIT_TALK, m_EditTalk);
+	m_EditTalk.SetLimitText(2048);
 }
 
 
@@ -63,15 +64,12 @@ void CTalkDlg::OnBnClickedButtonTalk()
 	CString strData;
 	m_EditTalk.GetWindowText(strData);            //EditBox <20>ϻ<EFBFBD><CFBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-	char* szBuffer = new char[iLength + 1];		// 2019.1.5 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1
-	memset(szBuffer,0,sizeof(char)*iLength);
-
+	char szBuffer[4096] = {0};
 	strcpy(szBuffer,strData.GetBuffer(0));
 
 	m_EditTalk.SetWindowText(NULL);          //EditBox <20>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 	m_iocpServer->OnClientPreSending(m_ContextObject, (LPBYTE)szBuffer, strlen(szBuffer));//<2F><><EFBFBD>Լ<EFBFBD><D4BC>ڴ<EFBFBD><DAB4>е<EFBFBD><D0B5><EFBFBD><EFBFBD>ݷ<EFBFBD><DDB7><EFBFBD>
-	delete [] szBuffer;
 }
 
 

server/2015Remote/VideoDlg.cpp

@@ -9,15 +9,110 @@
 
 enum
 {
+	IDM_ENABLECOMPRESS = 0x0010,	// <20><>Ƶѹ<C6B5><D1B9>
 	IDM_SAVEAVI,					// <20><><EFBFBD><EFBFBD>¼<EFBFBD><C2BC>
 };
 // CVideoDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
 
 IMPLEMENT_DYNAMIC(CVideoDlg, CDialog)
 
+AVISTREAMINFO CBmpToAvi::m_si;
+
+CBmpToAvi::CBmpToAvi()
+{
+	m_pfile = NULL;
+	m_pavi = NULL;
+	AVIFileInit();
+}
+
+CBmpToAvi::~CBmpToAvi()
+{
+	AVIFileExit();
+}
+
+bool CBmpToAvi::Open( LPCTSTR szFile, LPBITMAPINFO lpbmi )
+{
+	if (szFile == NULL)
+		return false;
+	m_nFrames = 0;
+
+	if (AVIFileOpen(&m_pfile, szFile, OF_WRITE | OF_CREATE, NULL))
+		return false;
+
+	m_si.fccType = streamtypeVIDEO;
+	m_si.fccHandler = BI_RGB;
+	m_si.dwScale = 1;
+	m_si.dwRate = 8; // ֡<><D6A1>
+	SetRect(&m_si.rcFrame, 0, 0, lpbmi->bmiHeader.biWidth, lpbmi->bmiHeader.biHeight);
+	m_si.dwSuggestedBufferSize = lpbmi->bmiHeader.biSizeImage;
+
+	if (AVIFileCreateStream(m_pfile, &m_pavi, &m_si))
+		return false;
+
+
+	if (AVIStreamSetFormat(m_pavi, 0, lpbmi, sizeof(BITMAPINFO)) != AVIERR_OK)
+		return false;
+
+	return true;
+}
+
+bool CBmpToAvi::Write(LPVOID lpBuffer)
+{
+	if (m_pfile == NULL || m_pavi == NULL)
+		return false;
+
+	return AVIStreamWrite(m_pavi, m_nFrames++, 1, lpBuffer, m_si.dwSuggestedBufferSize, AVIIF_KEYFRAME, NULL, NULL) == AVIERR_OK;	
+}
+
+
+void CBmpToAvi::Close()
+{
+	if (m_pavi)
+	{
+		AVIStreamRelease(m_pavi);
+		m_pavi = NULL;
+	}
+	if (m_pfile)
+	{
+		AVIFileRelease(m_pfile);
+		m_pfile = NULL;
+	}		
+}
+
+
+void CVideoDlg::SaveAvi(void)
+{
+	CMenu	*pSysMenu = GetSystemMenu(FALSE);
+	if (pSysMenu->GetMenuState(IDM_SAVEAVI, MF_BYCOMMAND) & MF_CHECKED)
+	{
+		pSysMenu->CheckMenuItem(IDM_SAVEAVI, MF_UNCHECKED);
+		m_aviFile.Empty();
+		m_aviStream.Close();
+		return;
+	}
+
+	CString	strFileName = m_strIPAddress + CTime::GetCurrentTime().Format("_%Y-%m-%d_%H-%M-%S.avi");
+	CFileDialog dlg(FALSE, "avi", strFileName, OFN_OVERWRITEPROMPT, "<EFBFBD><EFBFBD>Ƶ<EFBFBD>ļ<EFBFBD>(*.avi)|*.avi|", this);
+	if(dlg.DoModal () != IDOK)
+		return;
+	m_aviFile = dlg.GetPathName();
+	if (!m_aviStream.Open(m_aviFile, m_BitmapInfor_Full))
+	{
+		m_aviFile.Empty();
+		MessageBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʧ<EFBFBD><EFBFBD>!");	
+	}
+	else
+	{
+		pSysMenu->CheckMenuItem(IDM_SAVEAVI, MF_CHECKED);
+	}
+}
+
+
 CVideoDlg::CVideoDlg(CWnd* pParent, IOCPServer* IOCPServer, CONTEXT_OBJECT *ContextObject)
 	: CDialog(CVideoDlg::IDD, pParent)
 {
+	m_nCount = 0;
+	m_aviFile.Empty();
 	m_ContextObject = ContextObject;
 	m_iocpServer = IOCPServer;
 	m_BitmapInfor_Full = NULL;
@@ -52,6 +147,12 @@ void CVideoDlg::ResetScreen(void)
 
 CVideoDlg::~CVideoDlg()
 {
+	if (!m_aviFile.IsEmpty())
+	{
+		SaveAvi();
+		m_aviFile.Empty();
+	}
+
 	if (m_pVideoCodec)
 	{
 		delete m_pVideoCodec;
@@ -103,8 +204,9 @@ BOOL CVideoDlg::OnInitDialog()
 		m_hDD = DrawDibOpen();
 
 		m_hDC = ::GetDC(m_hWnd);
-
+		SysMenu->AppendMenu(MF_STRING, IDM_ENABLECOMPRESS, "<EFBFBD><EFBFBD>Ƶѹ<EFBFBD><EFBFBD>(&C)");
 		SysMenu->AppendMenu(MF_STRING, IDM_SAVEAVI, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>(&V)");
+		SysMenu->AppendMenu(MF_SEPARATOR);
 
 		CString strString;
 
@@ -117,12 +219,20 @@ BOOL CVideoDlg::OnInitDialog()
 		m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE));
 	}
 
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// <20>쳣: OCX <20><><EFBFBD><EFBFBD>ҳӦ<D2B3><D3A6><EFBFBD><EFBFBD> FALSE
+	m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_CAMERA));
+	SetIcon(m_hIcon, TRUE);
+	SetIcon(m_hIcon, FALSE);
+
+	return TRUE;
 }
 
 void CVideoDlg::OnClose()
 {
+	if (!m_aviFile.IsEmpty())
+	{
+		SaveAvi();
+		m_aviFile.Empty();
+	}
 #if CLOSE_DELETE_DLG
 	m_ContextObject->v1 = 0;
 #endif
@@ -137,6 +247,8 @@ void CVideoDlg::OnClose()
 
 void CVideoDlg::OnReceiveComplete(void)
 {
+	++m_nCount;
+
 	switch (m_ContextObject->InDeCompressedBuffer.GetBuffer(0)[0])
 	{
 	case TOKEN_WEBCAM_DIB:
@@ -156,35 +268,31 @@ void CVideoDlg::DrawDIB(void)
 	if (SysMenu == NULL)
 		return;
 
-	int		nHeadLen = 1 + 1 + 4;       
+	const int nHeadLen = 1 + 1 + 4;       
 
 	LPBYTE	szBuffer = m_ContextObject->InDeCompressedBuffer.GetBuffer();
 	UINT	ulBufferLen = m_ContextObject->InDeCompressedBuffer.GetBufferLength();
 	if (szBuffer[1] == 0) // û<>о<EFBFBD><D0BE><EFBFBD>H263ѹ<33><D1B9><EFBFBD><EFBFBD>ԭʼ<D4AD><CABC><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>
 	{
 		// <20><>һ<EFBFBD>Σ<EFBFBD>û<EFBFBD><C3BB>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD>֧<EFBFBD><D6A7>ָ<EFBFBD><D6B8><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD><EFBFBD><EFBFBD>
-		/*	if (m_nCount == 1)
+		if (m_nCount == 1)
 		{
-		pSysMenu->EnableMenuItem(IDM_ENABLECOMPRESS, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+			SysMenu->EnableMenuItem(IDM_ENABLECOMPRESS, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 		}
-		pSysMenu->CheckMenuItem(IDM_ENABLECOMPRESS, MF_UNCHECKED);
-		memcpy(m_lpScreenDIB, lpBuffer + nHeadLen, nBufferLen - nHeadLen);*/
+		SysMenu->CheckMenuItem(IDM_ENABLECOMPRESS, MF_UNCHECKED);
+		memcpy(m_BitmapData_Full, szBuffer + nHeadLen, ulBufferLen - nHeadLen);
 	}
-
 	else // <20><><EFBFBD><EFBFBD>
 	{
 		////<2F><><EFBFBD>ﻺ<EFBFBD><EFBBBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵĵڶ<C4B5><DAB6><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD> 
-		InitCodec(*(LPDWORD)(szBuffer + 2)); //<2F>ж<EFBFBD>       
+		InitCodec(*(LPDWORD)(szBuffer + 2)); //<2F>ж<EFBFBD>
 		if (m_pVideoCodec != NULL)
 		{
-			//pSysMenu->CheckMenuItem(IDM_ENABLECOMPRESS, MF_CHECKED);
-			memcpy(m_BitmapCompressedData_Full, szBuffer + nHeadLen, ulBufferLen - nHeadLen);   //<2F><>Ƶû<C6B5>н<EFBFBD>ѹ
+			SysMenu->CheckMenuItem(IDM_ENABLECOMPRESS, MF_CHECKED);
+			memcpy(m_BitmapCompressedData_Full, szBuffer + nHeadLen, ulBufferLen - nHeadLen); //<2F><>Ƶû<C6B5>н<EFBFBD>ѹ
 			//<2F><><EFBFBD>￪ʼ<EFBFAA><CABC><EFBFBD>룬<EFBFBD><EBA3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬδѹ<CEB4><D1B9><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD> <20><>ʾ<EFBFBD><CABE><EFBFBD>Ի<EFBFBD><D4BB><EFBFBD><EFBFBD>ϡ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>avi<76><69>ʽ
 			m_pVideoCodec->DecodeVideoData(m_BitmapCompressedData_Full, ulBufferLen - nHeadLen, 
-				(LPBYTE)m_BitmapData_Full, NULL,  NULL);  //<2F><><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD>ݽ<EFBFBD>ѹ<EFBFBD><EFBFBD>m_lpScreenDIB
-
-			/*	m_pVideoCodec->DecodeVideoData(m_lpCompressDIB, nBufferLen - nHeadLen, 
-			(LPBYTE)m_lpScreenDIB, NULL,  NULL);  //<2F><><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD>ݽ<EFBFBD>ѹ<EFBFBD><D1B9>m_lpScreenDIB*/
+				(LPBYTE)m_BitmapData_Full, NULL,  NULL);  //<2F><><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD>ݽ<EFBFBD>ѹ
 		}
 	}
 
@@ -198,9 +306,16 @@ void CVideoDlg::InitCodec(DWORD fccHandler)
 		return;
 
 	m_pVideoCodec = new CVideoCodec;
-	if (!m_pVideoCodec->InitCompressor(m_BitmapInfor_Full, fccHandler))     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˸<EFBFBD>ʽ ƥ<><C6A5><EFBFBD><EFBFBD>
+	if (!m_pVideoCodec->InitCompressor(m_BitmapInfor_Full, fccHandler))
 	{
 		OutputDebugStringA("======> InitCompressor failed \n");
+		delete m_pVideoCodec;
+		// <20><>NULL, <20><><EFBFBD><EFBFBD>ʱ<EFBFBD>ж<EFBFBD><D0B6>Ƿ<EFBFBD>ΪNULL<4C><4C><EFBFBD>ж<EFBFBD><D0B6>Ƿ<EFBFBD>ѹ<EFBFBD><D1B9>
+		m_pVideoCodec = NULL;
+		// ֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><CBB2><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>
+		BYTE bToken = COMMAND_WEBCAM_DISABLECOMPRESS;
+		m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE));
+		GetSystemMenu(FALSE)->EnableMenuItem(IDM_ENABLECOMPRESS, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
 	}
 }
 
@@ -212,6 +327,19 @@ void CVideoDlg::OnSysCommand(UINT nID, LPARAM lParam)
 	{
 	case IDM_SAVEAVI:
 		{
+			SaveAvi();
+			break;
+		}
+	case IDM_ENABLECOMPRESS:
+		{
+			CMenu *pSysMenu = GetSystemMenu(FALSE);
+			bool bIsChecked = pSysMenu->GetMenuState(IDM_ENABLECOMPRESS, MF_BYCOMMAND) & MF_CHECKED;
+			pSysMenu->CheckMenuItem(IDM_ENABLECOMPRESS, bIsChecked ? MF_UNCHECKED : MF_CHECKED);
+			bIsChecked = !bIsChecked;
+			BYTE	bToken = COMMAND_WEBCAM_ENABLECOMPRESS;
+			if (!bIsChecked)
+				bToken = COMMAND_WEBCAM_DISABLECOMPRESS;
+			m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE));
 			break;
 		}
 	}
@@ -243,4 +371,14 @@ void CVideoDlg::OnPaint()
 		m_BitmapInfor_Full->bmiHeader.biWidth, m_BitmapInfor_Full->bmiHeader.biHeight, 
 		DDF_SAME_HDC
 		);
+
+	if (!m_aviFile.IsEmpty())
+	{
+		m_aviStream.Write(m_BitmapData_Full);
+		// <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>¼<EFBFBD><C2BC>
+		SetBkMode(m_hDC, TRANSPARENT);
+		SetTextColor(m_hDC, RGB(0xff,0x00,0x00));
+		const LPCTSTR lpTipsString = "Recording";
+		TextOut(m_hDC, 0, 0, lpTipsString, lstrlen(lpTipsString));
+	}
 }

server/2015Remote/VideoDlg.h

@@ -7,6 +7,25 @@
 
 #pragma comment(lib,"Vfw32.lib")
 
+/************************************************************************
+* @class CBmpToAvi
+* @brief λͼתAVI֡
+************************************************************************/
+class CBmpToAvi
+{
+public:
+	CBmpToAvi();
+	virtual ~CBmpToAvi();
+	bool Open(LPCTSTR szFile, LPBITMAPINFO lpbmi);
+	bool Write(LPVOID lpBuffer);
+	void Close();
+private:
+	PAVIFILE m_pfile;
+	PAVISTREAM m_pavi;
+	int m_nFrames;
+	static AVISTREAMINFO m_si; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>Ǿ<EFBFBD>̬<EFBFBD><CCAC>
+};
+
 class CVideoCodec  
 {
 	COMPVARS	m_cv;
@@ -141,6 +160,7 @@ public:
 class CVideoDlg : public CDialog
 {
 	DECLARE_DYNAMIC(CVideoDlg)
+	HICON m_hIcon;
 
 public:
 	CVideoDlg(CWnd* pParent = NULL, IOCPServer* IOCPServer = NULL, CONTEXT_OBJECT *ContextObject = NULL);   // <20><>׼<EFBFBD><D7BC><EFBFBD>캯<EFBFBD><ECBAAF>
@@ -156,8 +176,13 @@ public:
 	void OnReceiveComplete(void);
 	void DrawDIB(void);
 
+	void SaveAvi(void);
 	void InitCodec(DWORD fccHandler);
 
+	CString		m_aviFile; // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>վ<EFBFBD>д<EFBFBD><D0B4>
+	CBmpToAvi	m_aviStream;
+
+	int			m_nCount;
 	HDC			m_hDC;
 	HDRAWDIB	m_hDD;
 

server/2015Remote/stdafx.h

@@ -6,7 +6,7 @@
 #pragma once
 
 // <20>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>ZLIB
-#define USING_ZLIB 0
+#define USING_ZLIB 1
 
 #if !USING_ZLIB
 // <20>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9>LZ4
@@ -245,7 +245,7 @@ public:
 
 #ifdef _DEBUG
 // <20><><EFBFBD>ܼ<EFBFBD><DCBC>㵱ǰ<E3B5B1><C7B0><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ӡ
-#define AUTO_TICK(thresh) auto_tick(__FUNCTION__, thresh)
+#define AUTO_TICK(thresh) auto_tick TICK(__FUNCTION__, thresh)
 #else
 #define AUTO_TICK(thresh) 
 #endif