20151130

ldcsaa · hezlog · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013 · Dec 24, 2013
commit e14ed680e1cc280c053a23eb0dcce817ab4be46f
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,16 @@
+==========================================================================================
+v3.3.2 ���£�
+==========================================================================================
+
+> ���������
+-----------------
+1����ǿ���������
+2���޸� C#��E ���� SDK ����֪ Bug
+
+> ����˵����
+-----------------
+1��HP-Socket v3.3.2 ��ȫ���� HP-Socket v3.3.1 �汾������ֱ���滻����
+
 ==========================================================================================
 v3.3.1 ���£�
 ==========================================================================================

diff --git a/Common/ChangeLog.txt b/Common/ChangeLog.txt
@@ -3,6 +3,13 @@ Module	: vc-common-src
 Desc	: HP-Socket �� VC-Logger �Ĺ��������
 Usage	: ����Ҫ�Ĵ����ļ����뵽��Ŀ��
 
+==========================================================================================
+v2.3.9 ���£�
+==========================================================================================
+
+1���޸� GeneralHelper.h����߱��������
+2���޸� Thread.h�������ֲ߳̾��洢�� CTlsObj
+
 ==========================================================================================
 v2.3.8 ���£�
 ==========================================================================================

diff --git a/Common/License.txt b/Common/License.txt
@@ -1,7 +1,7 @@
 /*
  * Copyright JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/CriticalSection.cpp b/Common/Src/CriticalSection.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/CriticalSection.h b/Common/Src/CriticalSection.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Event.cpp b/Common/Src/Event.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/Event.h b/Common/Src/Event.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/FuncHelper.cpp b/Common/Src/FuncHelper.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/FuncHelper.h b/Common/Src/FuncHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/GeneralHelper.cpp b/Common/Src/GeneralHelper.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa

diff --git a/Common/Src/GeneralHelper.h b/Common/Src/GeneralHelper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa
@@ -43,6 +43,8 @@ Windows CE:
 _DETECT_MEMORY_LEAK	: DEBUG ״̬��֧���ڴ�й¶���
 _ONLY_DETECT_CONFIRMED_MEMORY_LEAK_	: ֻ�����ܹ�ȷ�ϵ��ڴ�й¶������ȷ���Ĳ����棩
 ---------------------------
+VC 2015
+	_MSC_VER == 1900
 VC 2013
 	_MSC_VER == 1800
 VC 2012
@@ -60,55 +62,39 @@ VC 7.0
 VC 6.0
 	_MSC_VER == 1200
 ---------------------------
-Windows 8
-	_WIN32_WINNT >= 0x0602 (_WIN32_WINNT_WIN8)
-	WINVER >= 0x0602
-Windows 7
-	_WIN32_WINNT >= 0x0601 (_WIN32_WINNT_WIN7)
-	WINVER >= 0x0601
-Windows Server 2008
-	_WIN32_WINNT >= 0x0600 (_WIN32_WINNT_WS08)
-	WINVER >= 0x0600
-Windows Vista
-	_WIN32_WINNT >= 0x0600 (_WIN32_WINNT_VISTA)
-	WINVER >= 0x0600
-Windows Server 2003
-	_WIN32_WINNT >= 0x0502 (_WIN32_WINNT_WS03)
-	WINVER >= 0x0502
-Windows XP
-	_WIN32_WINNT >= 0x0501 (_WIN32_WINNT_WINXP)
-	WINVER >= 0x0501
-Windows 2000
-	_WIN32_WINNT >= 0x0500 (_WIN32_WINNT_WIN2K)
-	WINVER >= 0x0500
-Windows NT 4.0
-	_WIN32_WINNT >= 0x0400
-	WINVER >= 0x0400
-Windows Me
-	_WIN32_WINDOWS=0x0500
-	WINVER >= 0x0500
-Windows 98
-	_WIN32_WINDOWS >= 0x0410
-	WINVER >= 0x0410
-Windows 95
-	_WIN32_WINDOWS >= 0x0400
-	WINVER >= 0x0400
+Windows Versions:
+_WIN32_WINNT_NT4		x0400
+_WIN32_WINNT_WIN2K		0x0500
+_WIN32_WINNT_WINXP		0x0501
+_WIN32_WINNT_WS03		0x0502
+_WIN32_WINNT_WIN6		0x0600
+_WIN32_WINNT_VISTA		0x0600
+_WIN32_WINNT_WS08		0x0600
+_WIN32_WINNT_LONGHORN	0x0600
+_WIN32_WINNT_WIN7		0x0601
+_WIN32_WINNT_WIN8		0x0602
+_WIN32_WINNT_WINBLUE	0x0603
+_WIN32_WINNT_WIN10		0x0A00
 ---------------------------
 */
 
 #pragma once
 
 #ifndef VC_EXTRALEAN
-	#define VC_EXTRALEAN						// �� Windows ͷ�ļ����ų�����ʹ�õ�����
+	#define VC_EXTRALEAN
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
 #endif
 
 #ifndef _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
-	#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// ĳЩ CString ���캯����Ϊ��ʽ��
+	#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
 #endif
 
-#if _MSC_VER >= 1400							// VC 8.0 ���ϰ汾
+#if _MSC_VER >= 1400
 
-	#ifdef _DEBUG
+	#if defined _DEBUG && _MSC_VER < 1600
 		#ifndef _SECURE_SCL
 			#define _SECURE_SCL					0
 		#endif
@@ -137,101 +123,36 @@ Windows 95
 		#define _SECURE_ATL						1
 	#endif
 
-#endif
-
-#if _MSC_VER < 1600
-
-	#if !defined(nullptr)
-		#define nullptr	NULL	// ���� nulllptr
+	#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+		#define _WINSOCK_DEPRECATED_NO_WARNINGS	1
 	#endif
 
 #endif
 
-#ifdef _WIN32_WCE				// Windows CE
-
-	#ifdef _DEBUG
-		#define DBG_MSG	TRUE
-		#pragma comment(linker, "/nodefaultlib:libcd.lib")
+#ifndef _WIN32_WINNT
+	#if defined (_WIN64)
+		#define _WIN32_WINNT	_WIN32_WINNT_WIN7
 	#else
-		#define DBG_MSG	FALSE
-		#pragma comment(linker, "/nodefaultlib:libc.lib")
-	#endif
-
-	#ifndef WINVER
-		#define WINVER	_WIN32_WCE
-	#endif
-
-	#ifndef _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
-		#define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
-	#endif
-
-	#ifndef _CE_ACTIVEX
-		#define _CE_ACTIVEX
-	#endif
-
-	#ifdef _CE_DCOM
-		#ifndef _ATL_APARTMENT_THREADED
-			#define _ATL_APARTMENT_THREADED
-		#endif
-	#endif
-
-	#ifndef _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
-		#define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
-	#endif
-
-	#if defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
-		#ifndef SHELL_AYGSHELL
-			#define SHELL_AYGSHELL
-		#endif
-
-		#ifndef _DEVICE_RESOLUTION_AWARE
-			#define _DEVICE_RESOLUTION_AWARE
-		#endif
-
-		#ifdef _DEVICE_RESOLUTION_AWARE
-			#include "DeviceResolutionAware.h"
-		#endif
-
-		#if (_WIN32_WCE < 0x500)
-			#pragma comment(lib, "ccrtrtti.lib")
-			#ifdef _X86_	
-				#if defined(_DEBUG)
-					#pragma comment(lib, "libcmtx86d.lib")
-				#else
-					#pragma comment(lib, "libcmtx86.lib")
-				#endif
-			#endif
-		#endif
-	#endif
-
-#else	// Windows NT
-
-	#ifndef WIN32_LEAN_AND_MEAN
-		#define WIN32_LEAN_AND_MEAN						// �� Windows ͷ�ļ����ų�����ʹ�õ�����
-	#endif
-
-	#ifndef _WIN32_WINNT
-		#if defined (_WIN64)
-			#define _WIN32_WINNT	_WIN32_WINNT_WIN7	// 64 λϵͳĬ�ϰ汾Ϊ Windows 7
-		#else
-			#define _WIN32_WINNT	_WIN32_WINNT_WINXP	// 32 λϵͳĬ�ϰ汾Ϊ Windows XP
-		#endif
-	#endif
-
-	#ifndef WINVER
-		#define WINVER			_WIN32_WINNT
-	#endif
-
-	#ifdef _DETECT_MEMORY_LEAK
-		#ifndef _CRTDBG_MAP_ALLOC
-			#define _CRTDBG_MAP_ALLOC
-		#endif
+		#define _WIN32_WINNT	_WIN32_WINNT_WINXP
 	#endif
+#endif
 
+#ifndef WINVER
+	#define WINVER	_WIN32_WINNT
 #endif
 
 #if _MSC_VER >= 1600
 	#include <SDKDDKVer.h>
+#else
+	#if !defined(nullptr)
+		#define nullptr	NULL
+	#endif
+#endif
+
+#ifdef _DETECT_MEMORY_LEAK
+	#ifndef _CRTDBG_MAP_ALLOC
+		#define _CRTDBG_MAP_ALLOC
+	#endif
 #endif
 
 #ifdef _USE_MFC
@@ -240,20 +161,20 @@ Windows 95
 		#define _AFX_ALL_WARNINGS
 	#endif
 
-	#include <afxwin.h>				// MFC core and standard components
-	#include <afxext.h>				// MFC extensions
-	#include <afxdisp.h>			// MFC Automation classes
+	#include <afxwin.h>
+	#include <afxext.h>
+	#include <afxdisp.h>
 
 	#ifndef _AFX_NO_OLE_SUPPORT
-		#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+		#include <afxdtctl.h>
 	#endif
 
 	#ifndef _AFX_NO_AFXCMN_SUPPORT
-		#include <afxcmn.h>			// MFC support for Windows Common Controls
+		#include <afxcmn.h>
 	#endif
 
 	#ifndef _NO_RIBBONS_SUPPORT
-		#include <afxcontrolbars.h>	// MFC support for ribbons and control bars
+		#include <afxcontrolbars.h>
 	#endif
 
 #else
@@ -296,11 +217,6 @@ Windows 95
 	#include <mswsock.h>
 #endif
 
-#ifdef _WIN32_WCE
-	#include <ceconfig.h>
-	#include <altcecrt.h>
-#endif
-
 #include <atlbase.h>
 #include <atlconv.h>
 
@@ -314,9 +230,5 @@ Windows 95
 #include "bufferptr.h"
 
 #if defined (_DEBUG) && defined (_DETECT_MEMORY_LEAK)
-	#if defined (_WIN32_WCE)
-		#include "debug/ce_crtdbg.h"
-	#else
-		#include "debug/win32_crtdbg.h"
-	#endif
+	#include "debug/win32_crtdbg.h"
 #endif
diff --git a/Common/Src/PrivateHeap.cpp b/Common/Src/PrivateHeap.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright: JessMA Open Source (ldcsaa@gmail.com)
  *
- * Version	: 2.3.8
+ * Version	: 2.3.9
  * Author	: Bruce Liang
  * Website	: http://www.jessma.org
  * Project	: https://github.com/ldcsaa