diff --git a/ReadMe.txt b/ReadMe.txt
index a282903..6aa4627 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -155,3 +155,7 @@
 1、发布V1.0.0.3。
 
 2、修复Release模式打不开远程视频，或打开视频时画面卡住的问题，问题出在CCaptureVideo GetDIB。
+
+2019.2.4
+
+清理垃圾注释、整理不良排版，对代码略有改动。
diff --git a/client/AudioManager.cpp b/client/AudioManager.cpp
index 06e666d..26f4fc8 100644
--- a/client/AudioManager.cpp
+++ b/client/AudioManager.cpp
@@ -28,7 +28,7 @@ CAudioManager::CAudioManager(IOCPClient* ClientObject, int n):CManager(ClientObj
 	}
 
 	BYTE	bToken = TOKEN_AUDIO_START;
-	m_ClientObject->OnServerSending((char*)&bToken, 1);  
+	m_ClientObject->OnServerSending((char*)&bToken, 1);
 
 	WaitForDialogOpen();    //�ȴ��Ի����
 	szPacket = NULL;
diff --git a/client/CaptureVideo.cpp b/client/CaptureVideo.cpp
index 6e18ee5..f3449f8 100644
--- a/client/CaptureVideo.cpp
+++ b/client/CaptureVideo.cpp
@@ -41,7 +41,6 @@ CCaptureVideo::~CCaptureVideo()
 	CoUninitialize() ; 
 }
 
-//!!�Ҳ�����
 HRESULT CCaptureVideo::Open(int iDeviceID,int iPress)
 {
 	printf("CCaptureVideo call Open\n");
diff --git a/client/LoginServer.h b/client/LoginServer.h
index c647916..8ff9aad 100644
--- a/client/LoginServer.h
+++ b/client/LoginServer.h
@@ -7,9 +7,9 @@
 
 typedef struct  _LOGIN_INFOR
 {	
-	BYTE			bToken;			// = 1    //��½��Ϣ
+	BYTE			bToken;			// ȡ1����½��Ϣ
 	OSVERSIONINFOEX	OsVerInfoEx;	// �汾��Ϣ
-	DWORD			dwCPUMHz;	// CPU��Ƶ
+	DWORD			dwCPUMHz;		// CPU��Ƶ
 	IN_ADDR			ClientAddr;		// �洢32λ��IPv4�ĵ�ַ���ݽṹ
 	char			szPCName[MAX_PATH];	// ������
 	BOOL			bWebCamIsExist;		// �Ƿ�������ͷ
diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp
index f8da1b3..bf1a163 100644
--- a/server/2015Remote/2015RemoteDlg.cpp
+++ b/server/2015Remote/2015RemoteDlg.cpp
@@ -26,7 +26,9 @@
 
 #define UM_ICONNOTIFY WM_USER+100
 
+// �ļ��Ի������飨��Ϊ���׵��³�����������˲��ԣ�
 std::vector<CFileManagerDlg	*> v_FileDlg;
+// ע����Ի������飨��Ϊ���׵��³�����������˲��ԣ�
 std::vector<CRegisterDlg	*> v_RegDlg;
 
 enum
@@ -43,38 +45,37 @@ enum
 
 typedef struct
 {
-	char*   szTitle;           //�������
+	const char*   szTitle;     //�������
 	int		nWidth;            //�б��Ŀ���
 }COLUMNSTRUCT;
 
+const int  g_Column_Count_Online  = 7; // ����������
 
-COLUMNSTRUCT g_Column_Data_Online[] = 
+COLUMNSTRUCT g_Column_Data_Online[g_Column_Count_Online] = 
 {
-	{"IP",			148	},
+	{"IP",				148	},
 	{"�˿�",			150	},
 	{"�������/��ע",	160	},
 	{"����ϵͳ",		128	},
-	{"CPU",			80	},
-	{"����ͷ",		81	},
-	{"PING",			151	}
+	{"CPU",				80	},
+	{"����ͷ",			81	},
+	{"PING",			151	},
 };
 
 // ����Ӧ�ó��򡰹��ڡ��˵���� CAboutDlg �Ի���
-int  g_Column_Count_Online  = 7;
 
-COLUMNSTRUCT g_Column_Data_Message[] = 
+const int g_Column_Count_Message = 3;   // �б��ĸ���
+
+COLUMNSTRUCT g_Column_Data_Message[g_Column_Count_Message] = 
 {
 	{"��Ϣ����",		200	},
 	{"ʱ��",			200	},
 	{"��Ϣ����",	    490	}
 };
 
-int g_Column_Count_Message = 3;   //�б��ĸ���
-
-
-int g_Column_Online_Width  = 0; 
-int g_Column_Message_Width = 0; 
-IOCPServer *m_iocpServer   = NULL;  
+int g_Column_Online_Width  = 0;
+int g_Column_Message_Width = 0;
+IOCPServer *m_iocpServer   = NULL;
 CMy2015RemoteDlg*  g_2015RemoteDlg = NULL;
 
 static UINT Indicators[] =
@@ -114,8 +115,7 @@ END_MESSAGE_MAP()
 // CMy2015RemoteDlg �Ի���
 
 
-CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent /*=NULL*/)
-	: CDialogEx(CMy2015RemoteDlg::IDD, pParent)
+CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent): CDialogEx(CMy2015RemoteDlg::IDD, pParent)
 {
 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 
@@ -189,17 +189,9 @@ void CMy2015RemoteDlg::OnIconNotify(WPARAM wParam, LPARAM lParam)
 	case WM_LBUTTONDOWN: 
 	case WM_LBUTTONDBLCLK: 
 		{
-			if (!IsWindowVisible())
-			{
-				ShowWindow(SW_SHOW);
-			}
-			else
-			{
-				ShowWindow(SW_HIDE);
-			}
+			ShowWindow(IsWindowVisible() ? SW_HIDE : SW_SHOW);
 			break;
 		}
-
 	case WM_RBUTTONDOWN:
 		{
 			CMenu Menu;
@@ -218,8 +210,7 @@ void CMy2015RemoteDlg::OnIconNotify(WPARAM wParam, LPARAM lParam)
 
 VOID CMy2015RemoteDlg::CreateSolidMenu()
 {
-	HMENU hMenu;   //SDK  C   MFC  C++
-	hMenu = LoadMenu(NULL,MAKEINTRESOURCE(IDR_MENU_MAIN));   //����˵���Դ
+	HMENU hMenu = LoadMenu(NULL,MAKEINTRESOURCE(IDR_MENU_MAIN));   //����˵���Դ
 	::SetMenu(this->GetSafeHwnd(),hMenu);                    //Ϊ�������ò˵�
 	::DrawMenuBar(this->GetSafeHwnd());                      //��ʾ�˵�
 }
@@ -317,8 +308,6 @@ VOID CMy2015RemoteDlg::InitControl()
 	}
 
 	m_CList_Message.SetExtendedStyle(LVS_EX_FULLROWSELECT);
-
-	SetTimer(0,3000,NULL); // ��ʱ������õ��ļ��Ի���
 }
 
 
@@ -352,17 +341,10 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
 
 VOID CMy2015RemoteDlg::ShowMessage(BOOL bOk, CString strMsg)
 {
-	CString strIsOK,strTime;
-	CTime Timer =CTime::GetCurrentTime(); //����һ��CTime ���һ������ t ʹ�����еij�Ա����GetCurrentTime() ������ SDK����
-	strTime= Timer.Format("%H:%M:%S");
-	if (bOk)
-	{
-		strIsOK="ִ�гɹ�";
-	}
-	else
-	{
-		strIsOK="ִ��ʧ��";
-	}
+	CTime Timer = CTime::GetCurrentTime();
+	CString strTime= Timer.Format("%H:%M:%S");
+	CString strIsOK= bOk ? "ִ�гɹ�" : "ִ��ʧ��";
+	
 	m_CList_Message.InsertItem(0,strIsOK);    //��ؼ�����������
 	m_CList_Message.SetItemText(0,1,strTime);
 	m_CList_Message.SetItemText(0,2,strMsg);
@@ -548,29 +530,11 @@ void CMy2015RemoteDlg::OnSize(UINT nType, int cx, int cy)
 
 void CMy2015RemoteDlg::OnTimer(UINT_PTR nIDEvent)
 {
-	// TODO: �ڴ�������Ϣ������������/�����Ĭ��ֵ
-	switch(nIDEvent)
-	{
-
-	case 0:
-		{
-			break;
-		}
-
-	case 1:
-		{
-
-			break;
-		}
-	}
 }
 
 
 void CMy2015RemoteDlg::OnClose()
 {
-	// TODO: �ڴ�������Ϣ������������/�����Ĭ��ֵ
-	KillTimer(0);
-
 #if SHOW_NOTIFY
 	Shell_NotifyIcon(NIM_DELETE, &m_Nid);
 #endif
@@ -665,15 +629,13 @@ void CMy2015RemoteDlg::OnOnlineDelete()
 	BYTE bToken = COMMAND_BYE;   //�򱻿ض˷���һ��COMMAND_SYSTEM
 	SendSelectedCommand(&bToken, sizeof(BYTE));   //Context     PreSending   PostSending
 
-	CString  strIP;
 	int iCount = m_CList_Online.GetSelectedCount();
-	int i = 0;
 
-	for (i=0;i<iCount;++i)
+	for (int i=0;i<iCount;++i)
 	{
 		POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition();
 		int iItem = m_CList_Online.GetNextSelectedItem(Pos);
-		strIP = m_CList_Online.GetItemText(iItem,ONLINELIST_IP);  
+		CString strIP = m_CList_Online.GetItemText(iItem,ONLINELIST_IP);  
 		m_CList_Online.DeleteItem(iItem);
 		strIP+="�Ͽ�����";
 		ShowMessage(true,strIP);
@@ -693,8 +655,6 @@ VOID CMy2015RemoteDlg::OnOnlineProcessManager()
 	SendSelectedCommand(&bToken, sizeof(BYTE));	
 }
 
-
-
 VOID CMy2015RemoteDlg::OnOnlineWindowManager()
 {
 	BYTE	bToken = COMMAND_WSLIST;     
@@ -710,26 +670,25 @@ VOID CMy2015RemoteDlg::OnOnlineDesktopManager()
 
 VOID CMy2015RemoteDlg::OnOnlineFileManager()
 {
-	BYTE	bToken = COMMAND_LIST_DRIVE;  //���̾������豸      
-
+	BYTE	bToken = COMMAND_LIST_DRIVE;    
 	SendSelectedCommand(&bToken, sizeof(BYTE));
 }
 
 VOID CMy2015RemoteDlg::OnOnlineAudioManager()
 {
-	BYTE	bToken = COMMAND_AUDIO;                 //�򱻿ض˷�������
+	BYTE	bToken = COMMAND_AUDIO;
 	SendSelectedCommand(&bToken, sizeof(BYTE));
 }
 
 VOID CMy2015RemoteDlg::OnOnlineVideoManager()
 {
-	BYTE	bToken = COMMAND_WEBCAM;                 //�򱻿ض˷�������
+	BYTE	bToken = COMMAND_WEBCAM;
 	SendSelectedCommand(&bToken, sizeof(BYTE));
 }
 
 VOID CMy2015RemoteDlg::OnOnlineServerManager()
 {
-	BYTE	bToken = COMMAND_SERVICES;         //��ֵһ���� Ȼ���͵�����ˣ������������COMMAND_SYSTEM
+	BYTE	bToken = COMMAND_SERVICES;
 	SendSelectedCommand(&bToken, sizeof(BYTE));
 }
 
@@ -743,20 +702,24 @@ void CMy2015RemoteDlg::OnOnlineBuildClient()
 {
 	// TODO: �ڴ�����������������
 	CBuildDlg Dlg;
+	Dlg.m_strIP = ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetStr("settings", "localIp", "");
+	CString Port;
+	Port.Format("%d", ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetInt("settings", "ghost"));
+	Dlg.m_strPort = Port;
 	Dlg.DoModal();
 }
 
 
 VOID CMy2015RemoteDlg::SendSelectedCommand(PBYTE  szBuffer, ULONG ulLength)
 {
-	POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition();   //1[pcontext client]  2  3   //1    2
+	POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition();
 	while(Pos)
 	{
 		int	iItem = m_CList_Online.GetNextSelectedItem(Pos);
-		CONTEXT_OBJECT* ContextObject = (CONTEXT_OBJECT*)m_CList_Online.GetItemData(iItem); //���б���Ŀ��ȡ��ClientContext�ṹ��
+		CONTEXT_OBJECT* ContextObject = (CONTEXT_OBJECT*)m_CList_Online.GetItemData(iItem);
 
-		// ���ͻ���������б����ݰ�                                                 //�鿴ClientContext�ṹ��
-		m_iocpServer->OnClientPreSending(ContextObject,szBuffer, ulLength);         //Cleint   Context
+		// ���ͻ���������б����ݰ�
+		m_iocpServer->OnClientPreSending(ContextObject,szBuffer, ulLength);
 	} 
 }
 
@@ -769,15 +732,12 @@ VOID CMy2015RemoteDlg::OnAbout()
 //����Menu
 void CMy2015RemoteDlg::OnNotifyShow()
 {
-	// TODO: �ڴ�����������������
 	ShowWindow(SW_SHOW);
 }
 
 
 void CMy2015RemoteDlg::OnNotifyExit()
 {
-	// TODO: �ڴ�����������������
-
 	SendMessage(WM_CLOSE);
 }
 
@@ -799,9 +759,9 @@ void CMy2015RemoteDlg::OnMainExit()
 
 VOID CMy2015RemoteDlg::ListenPort()
 {
-	int nPort = ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetInt("settings", "ghost");         
+	int nPort = ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetInt("settings", "ghost");
 	//��ȡini �ļ��еļ����˿�
-	int nMaxConnection = ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetInt("settings", "MaxConnection");    
+	int nMaxConnection = ((CMy2015RemoteApp*)AfxGetApp())->m_iniFile.GetInt("settings", "MaxConnection");
 	//��ȡ���������
 	if (nPort<=0 || nPort>65535)
 		nPort = 6543;
@@ -1008,7 +968,7 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
 		switch (LoginInfor->OsVerInfoEx.dwPlatformId)
 		{
 		case VER_PLATFORM_WIN32_NT:
-			if (LoginInfor->OsVerInfoEx.dwMajorVersion <= 4 )
+			if ( LoginInfor->OsVerInfoEx.dwMajorVersion <= 4 )
 				strOS = "WindowsNT";
 			if ( LoginInfor->OsVerInfoEx.dwMajorVersion == 5 && LoginInfor->OsVerInfoEx.dwMinorVersion == 0 )
 				strOS = "Windows2000";
@@ -1022,6 +982,12 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
 				strOS = "Windows7";
 			if ( LoginInfor->OsVerInfoEx.dwMajorVersion == 6 && LoginInfor->OsVerInfoEx.dwMinorVersion == 2 )
 				strOS = "Windows8";
+			if ( LoginInfor->OsVerInfoEx.dwMajorVersion == 6 && LoginInfor->OsVerInfoEx.dwMinorVersion == 3 )
+				strOS = "Windows8.1";
+			if ( LoginInfor->OsVerInfoEx.dwMajorVersion == 6 && LoginInfor->OsVerInfoEx.dwMinorVersion == 4 )
+				strOS = "Windows10";
+			if ( LoginInfor->OsVerInfoEx.dwMajorVersion == 10 && LoginInfor->OsVerInfoEx.dwMinorVersion == 0 )
+				strOS = "Windows10";
 		}
 
 		//CPU
diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h
index 9ef66d0..2509186 100644
--- a/server/2015Remote/2015RemoteDlg.h
+++ b/server/2015Remote/2015RemoteDlg.h
@@ -16,9 +16,9 @@
 
 typedef struct  _LOGIN_INFOR
 {	
-	BYTE			bToken;			// = 1    //��½��Ϣ
+	BYTE			bToken;			// ȡ1����½��Ϣ
 	OSVERSIONINFOEX	OsVerInfoEx;	// �汾��Ϣ
-	DWORD			dwCPUMHz;	// CPU��Ƶ
+	DWORD			dwCPUMHz;		// CPU��Ƶ
 	IN_ADDR			ClientAddr;		// �洢32λ��IPv4�ĵ�ַ���ݽṹ
 	char			szPCName[MAX_PATH];	// ������
 	BOOL			bWebCamIsExist;		// �Ƿ�������ͷ
diff --git a/server/2015Remote/SystemDlg.cpp b/server/2015Remote/SystemDlg.cpp
index 285c38c..4b55288 100644
--- a/server/2015Remote/SystemDlg.cpp
+++ b/server/2015Remote/SystemDlg.cpp
@@ -394,5 +394,5 @@ void CSystemDlg::OnWlistMin()
 		memcpy(lpMsgBuf+1+sizeof(hwnd),&dHow,sizeof(DWORD));
 		m_iocpServer->OnClientPreSending(m_ContextObject, lpMsgBuf, sizeof(lpMsgBuf));	
 
-	}// TODO: �ڴ�����������������
+	}
 }
diff --git a/server/2015Remote/TalkDlg.cpp b/server/2015Remote/TalkDlg.cpp
index 84c4498..52b2c99 100644
--- a/server/2015Remote/TalkDlg.cpp
+++ b/server/2015Remote/TalkDlg.cpp
@@ -54,7 +54,7 @@ BOOL CTalkDlg::OnInitDialog()
 
 void CTalkDlg::OnBnClickedButtonTalk()
 {
-	int iLength = m_EditTalk.GetWindowTextLength();   //EditBox �ϻ�����ݳ���
+	int iLength = m_EditTalk.GetWindowTextLength();
 
 	if (!iLength)
 	{
@@ -62,14 +62,14 @@ void CTalkDlg::OnBnClickedButtonTalk()
 	}
 
 	CString strData;
-	m_EditTalk.GetWindowText(strData);            //EditBox �ϻ������
+	m_EditTalk.GetWindowText(strData);
 
 	char szBuffer[4096] = {0};
 	strcpy(szBuffer,strData.GetBuffer(0));
 
-	m_EditTalk.SetWindowText(NULL);          //EditBox �ϵ��������
+	m_EditTalk.SetWindowText(NULL);
 
-	m_iocpServer->OnClientPreSending(m_ContextObject, (LPBYTE)szBuffer, strlen(szBuffer));//���Լ��ڴ��е����ݷ���
+	m_iocpServer->OnClientPreSending(m_ContextObject, (LPBYTE)szBuffer, strlen(szBuffer));
 }
 
 
diff --git a/server/2015Remote/VideoDlg.cpp b/server/2015Remote/VideoDlg.cpp
index b5c71aa..c52798c 100644
--- a/server/2015Remote/VideoDlg.cpp
+++ b/server/2015Remote/VideoDlg.cpp
@@ -116,7 +116,7 @@ CVideoDlg::CVideoDlg(CWnd* pParent, IOCPServer* IOCPServer, CONTEXT_OBJECT *Cont
 	m_ContextObject = ContextObject;
 	m_iocpServer = IOCPServer;
 	m_BitmapInfor_Full = NULL;
-	m_pVideoCodec      = NULL;     //�������dz�ʼ����    �ҿ�
+	m_pVideoCodec      = NULL;
 	sockaddr_in  ClientAddress;
 	memset(&ClientAddress, 0, sizeof(ClientAddress));
 	int iClientAddressLength = sizeof(ClientAddress);
diff --git a/server/2015Remote/iniFile.cpp b/server/2015Remote/iniFile.cpp
index 7bede45..e026c23 100644
--- a/server/2015Remote/iniFile.cpp
+++ b/server/2015Remote/iniFile.cpp
@@ -31,6 +31,20 @@ BOOL iniFile::SetInt(CString MainKey,CString SubKey,int Data)
 	return ::WritePrivateProfileString(MainKey, SubKey,strData,m_IniFilePath);
 }
 
+
+CString iniFile::GetStr(CString MainKey, CString SubKey, CString def)
+{
+	char buf[_MAX_PATH];
+	::GetPrivateProfileString(MainKey, SubKey, def, buf, sizeof(buf), m_IniFilePath);
+	return buf;
+}
+
+
+BOOL iniFile::SetStr(CString MainKey, CString SubKey, CString Data)
+{
+	return ::WritePrivateProfileString(MainKey, SubKey, Data, m_IniFilePath);
+}
+
 iniFile::~iniFile(void)
 {
 }
diff --git a/server/2015Remote/iniFile.h b/server/2015Remote/iniFile.h
index 9a08354..96f8b96 100644
--- a/server/2015Remote/iniFile.h
+++ b/server/2015Remote/iniFile.h
@@ -6,6 +6,8 @@ public:
 	BOOL ContructIniFile();
 	int GetInt(CString MainKey,CString SubKey);
 	BOOL SetInt(CString MainKey,CString SubKey,int Data);
+	CString GetStr(CString MainKey,CString SubKey, CString def);
+	BOOL SetStr(CString MainKey,CString SubKey,CString Data);
 	CString  m_IniFilePath;
 	iniFile(void);
 	~iniFile(void);