v4.18-9570-rtm

nick2nookie · Jul 26, 2015 · 4b65e25 · 4b65e25
1 parent 860f743
commit 4b65e25
Show file tree

Hide file tree

Showing 27 changed files with 53 additions and 53 deletions.
diff --git a/src/BuildUtil/VpnBuilderConfig.cs b/src/BuildUtil/VpnBuilderConfig.cs
@@ -430,7 +430,7 @@ public static class OSList
 	{
 		// Windows
 		public static readonly OS Windows = new OS("windows", "Windows",
-			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2",
+			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2",
 			new Cpu[]
 			{
 				CpuList.intel,

diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c
@@ -235,18 +235,18 @@ bool IsSupportedWinVer(RPC_WINVER *v)
 		}
 	}
 
-#if	0
-	// Enable in future when supported
-	if ((v->VerMajor == 6 && v->VerMinor == 4) ||(v->VerMajor == 10 && v->VerMinor == 0))
+	if ((v->VerMajor == 6 && v->VerMinor == 4) || (v->VerMajor == 10 && v->VerMinor == 0))
 	{
-		// Windows 10, Server 10
-		if (v->ServicePack <= 0)
+		if (v->IsServer == false)
 		{
-			// SP0 only
-			return true;
+			// Windows 10 (not Windows Server 2016)
+			if (v->ServicePack <= 0)
+			{
+				// SP0 only
+				return true;
+			}
 		}
 	}
-#endif
 
 	return false;
 }

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
@@ -135,10 +135,10 @@
 
 
 // Version number
-#define	CEDAR_VER					417
+#define	CEDAR_VER					418
 
 // Build Number
-#define	CEDAR_BUILD					9566
+#define	CEDAR_BUILD					9570
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -153,16 +153,16 @@
 
 // Specify the location to build
 #ifndef	BUILD_PLACE
-#define	BUILD_PLACE			"pc25"
+#define	BUILD_PLACE			"pc30"
 #endif	// BUILD_PLACE
 
 // Specifies the build date
 #define	BUILD_DATE_Y		2015
 #define	BUILD_DATE_M		7
-#define	BUILD_DATE_D		16
-#define	BUILD_DATE_HO		21
-#define	BUILD_DATE_MI		34
-#define	BUILD_DATE_SE		56
+#define	BUILD_DATE_D		26
+#define	BUILD_DATE_HO		14
+#define	BUILD_DATE_MI		59
+#define	BUILD_DATE_SE		55
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c
@@ -8450,7 +8450,7 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create)
 		return false;
 	}
 
-	// Regulation in Windows 8
+	// Regulation in Windows 8 / 10
 	if (MsIsInfCatalogRequired())
 	{
 		if (CiIsValidVLanRegulatedName(create->DeviceName) == false)

diff --git a/src/Cedar/IPsec_Win7.c b/src/Cedar/IPsec_Win7.c
@@ -109,7 +109,7 @@
 
 
 // IPsec_Win7.c
-// Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012
+// Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012 / Windows 10
 
 #include <GlobalConst.h>
 

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9566
-VERSION 417
-BUILD_NAME beta
-BUILD_DATE 20150716_213456
+BUILD_NUMBER 9570
+VERSION 418
+BUILD_NAME rtm
+BUILD_DATE 20150726_145955
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
@@ -145,7 +145,7 @@ typedef struct x509_crl_st X509_CRL;
 #define	BUF_SIZE			512
 
 // Support Windows OS list
-#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
+#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
 
 // Infinite
 #ifndef	WINDOWS_H

diff --git a/src/Mayaqua/OS.c b/src/Mayaqua/OS.c
@@ -200,11 +200,11 @@ char *OsTypeToStr(UINT type)
 	case OSTYPE_WINDOWS_10:
 		return "Windows 10\0\n";
 	case OSTYPE_WINDOWS_SERVER_10:
-		return "Windows Server 10\0\n";
+		return "Windows Server 2016\0\n";
 	case OSTYPE_WINDOWS_11:
-		return "Windows 11 or later\0\n";
+		return "Newer than Windows 10\0\n";
 	case OSTYPE_WINDOWS_SERVER_11:
-		return "Windows Server 11 or later\0\n";
+		return "Newer than Windows Server 2016\0\n";
 	case OSTYPE_UNIX_UNKNOWN:
 		return "UNIX System\0\n";
 	case OSTYPE_LINUX:

diff --git a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c
@@ -293,7 +293,7 @@ bool SaveLangConfig(wchar_t *filename, char *str)
 		FreeLangList(o);
 	}
 
-	ret = DumpBufW(b, filename);
+	ret = DumpBufWIfNecessary(b, filename);
 
 	FreeBuf(b);
 

diff --git a/src/bin/hamcore/SeLow_x64.sys b/src/bin/hamcore/SeLow_x64.sys
diff --git a/src/bin/hamcore/SeLow_x86.sys b/src/bin/hamcore/SeLow_x86.sys
diff --git a/src/bin/hamcore/pxwfp_x64.sys b/src/bin/hamcore/pxwfp_x64.sys
diff --git a/src/bin/hamcore/pxwfp_x86.sys b/src/bin/hamcore/pxwfp_x86.sys
diff --git a/src/bin/hamcore/see.sys b/src/bin/hamcore/see.sys
diff --git a/src/bin/hamcore/see_x64.sys b/src/bin/hamcore/see_x64.sys
diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
@@ -236,10 +236,10 @@ TCPOPT_NOT_ADMIN			没有管理权限的用户不能使用 TCP 协议优化工
 
 
 # Windows Vista / Windows 7 / Windows 8 优化
-VISTA_MMCSS_MSG				你想优化 Windows Vista / Windows 7 / Windows 8 用于使用 VPN 进行多媒体文件的播放吗? (如: 视频、音频和流媒体)
-VISTA_MMCSS_MSG_2			Windows Vista / Windows 7 / Windows 8 的 VPN 优化已经完成。\r\n你想进行远程优化配置吗?
+VISTA_MMCSS_MSG				你想优化 Windows Vista / Windows 7 / Windows 8 / Windows 10 用于使用 VPN 进行多媒体文件的播放吗? (如: 视频、音频和流媒体)
+VISTA_MMCSS_MSG_2			Windows Vista / Windows 7 / Windows 8 / Windows 10 的 VPN 优化已经完成。\r\n你想进行远程优化配置吗?
 VISTA_MMCSS_MSG_3			您不能在当前环境下进行优化。
-VISTA_MMCSS_MSG_4			您必须具有管理员权限才可使用此功能。\r\n请注意，在 Windows Vista / Windows 7 / Windows 8 中，您应该使用“以管理员身份运行”执行程序。
+VISTA_MMCSS_MSG_4			您必须具有管理员权限才可使用此功能。\r\n请注意，在 Windows Vista / Windows 7 / Windows 8 / Windows 10 中，您应该使用“以管理员身份运行”执行程序。
 VISTA_MMCSS_MSG_5			优化完成。
 VISTA_MMCSS_MSG_6			优化配置被删除。
 
@@ -3861,7 +3861,7 @@ S_TOOL					OpenVPN Client 的示例文件生成工具
 S_TOOL2					创建一个 OpenVPN Client 配置是一项艰难的工作。您可以使用此工具来生成一个合适的 OpenVPN Client 配置文件。生成的配置示例文件可马上应用。本来，OpenVPN Client 会要求客户手写一个很难的配置文件。这个工具就可以帮助您创建一个有用的配置样本。您所需要为 OpenVPN Client 生成的配置文件就是点击以下按钮。
 B_CONFIG				为 OpenVPN Client 生成配置样本文件(&C)
 S_2						Microsoft SSTP VPN 克隆服务器功能
-S_3						该 VPN Server 有微软公司的 Windows Server 2008 / 2012 内建的 MS-SSTP VPN Server 的克隆功能。\r\n在 Windows Vista / 7 / 8 / RT 中内建的 MS-SSTP 客户端能连接此 VPN Client。
+S_3						该 VPN Server 有微软公司的 Windows Server 2008 / 2012 内建的 MS-SSTP VPN Server 的克隆功能。\r\n在 Windows Vista / 7 / 8 / RT / 10 中内建的 MS-SSTP 客户端能连接此 VPN Client。
 R_SSTP					开启 &MS-SSTP VPN 克隆 Server 功能
 S_SSTP					VPN Server 端 SSL 证书的 CN (通用名)值必须与该客户端指定的主机名吻合，并且该证书必须在该客户端的可信列表中。详细内容请参考微软的文档。
 S_4						指定用户名连接到虚拟 HUB 的方式，和通过使用克隆服务器进行默认 HUB 的选择规则，与 IPsec 服务器功能是一样的。
@@ -4230,7 +4230,7 @@ CMD_SWITCH_SELECT			切换选择(&I)
 #“查看”菜单
 CMD_TOP_VIEW				查看(&V)
 CMD_STATUSBAR				显示状态栏(&S)
-CMD_VISTASTYLE				Windows Vista / Windows 7 / Windows 8 风格(&T)
+CMD_VISTASTYLE				Windows Vista / 7 / 8 / 10 风格(&T)
 CMD_SHOWPORT				在连接列表中显示端口(&P)
 CMD_TRAYICON				显示任务托盘上的图标(&T)
 CMD_ICON					图标(&I)
@@ -4255,7 +4255,7 @@ CMD_PASSWORD				设置密码(&P)...\tCtrl+P
 CMD_TRUST					管理信任的 CA 证书列表(&T)\tCtrl+R
 CMD_NETIF					网络设备状态(&N)...
 CMD_TCPIP					TCP 协议优化工具(&O)...
-CMD_MMCSS					Windows Vista / Windows 7 / Windows 8 的优化(&V)...
+CMD_MMCSS					Windows Vista / 7 / 8 / 10 的优化(&V)...
 CMD_TRAFFIC					网络通信速度测试工具(&R)...\tCtrl+Q
 CMD_CM_SETTING				切换运行模式(&M)...
 CMD_LANGUAGE				语言设置(&L)
@@ -6240,7 +6240,7 @@ CMD_OpenVpnMakeConfig_ERROR				本样本设置文件不能保存为 "%s"。该
 
 # SstpEnable 命令
 CMD_SstpEnable						启用/禁用 Microsoft SSTP VPN 克隆服务器功能
-CMD_SstpEnable_Help					本 VPN Server 拥有植入在微软 Windows Server 2008 / 2012 中的 MS-SSTP VPN Server 的克隆功能。Windows Vista / 7 / 8 / RT 中的标准 MS-SSTP 用户端可以连接本 VPN Server。\n\n[注意]\n在 VPN Server 上的 SSL 证书 CN 值必须要和指定给客户端的主机名吻合。并且，该证书必须在 SSTP VPN Client 的信任列表中。详情请参见微软相关文件。\n您可以用用 ServerCertRegenerate 命令来取代当前 VPN Server 的证书，形成一个新的，有 CN 值字段的自我认证证书。这样的话，您需要在 SSTP VPN Client 注册这样一个新的自我认证证书作为一个可信任根证书。如果您的确想做这件复杂的事，请考虑购买一个商业权威机构的 SSL 证书，如 VeriSign 或者 GlobalSign。\n\n指定用户名连接到虚拟 HUB 的的方式，使用本克隆服务器功能来为默认虚拟 HUB 的选择规则都与 IPsec 服务器功能相同。详情，请参见 IPsecEnable 命令的帮助。\n\n要执行此命令，您必须具有 VPN Server 管理员权限。\n该命令在 VPN Bridge 上不能运行。\n以集群成员运行的 VPN Server 的虚拟 HUB 不能执行此命令。
+CMD_SstpEnable_Help					本 VPN Server 拥有植入在微软 Windows Server 2008 / 2012 中的 MS-SSTP VPN Server 的克隆功能。Windows Vista / 7 / 8 / RT / 10 中的标准 MS-SSTP 用户端可以连接本 VPN Server。\n\n[注意]\n在 VPN Server 上的 SSL 证书 CN 值必须要和指定给客户端的主机名吻合。并且，该证书必须在 SSTP VPN Client 的信任列表中。详情请参见微软相关文件。\n您可以用用 ServerCertRegenerate 命令来取代当前 VPN Server 的证书，形成一个新的，有 CN 值字段的自我认证证书。这样的话，您需要在 SSTP VPN Client 注册这样一个新的自我认证证书作为一个可信任根证书。如果您的确想做这件复杂的事，请考虑购买一个商业权威机构的 SSL 证书，如 VeriSign 或者 GlobalSign。\n\n指定用户名连接到虚拟 HUB 的的方式，使用本克隆服务器功能来为默认虚拟 HUB 的选择规则都与 IPsec 服务器功能相同。详情，请参见 IPsecEnable 命令的帮助。\n\n要执行此命令，您必须具有 VPN Server 管理员权限。\n该命令在 VPN Bridge 上不能运行。\n以集群成员运行的 VPN Server 的虚拟 HUB 不能执行此命令。
 CMD_SstpEnable_Args					SstpEnable [yes|no]
 CMD_SstpEnable_[yes|no]				指定 "yes"，启用Microsoft SSTP VPN 克隆服务器功能。指定 "no" 禁用该功能。
 CMD_SstpEnable_Prompt_[yes|no]		启用 SSTP VPN 克隆服务器功能(yes/no): 

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
@@ -232,10 +232,10 @@ TCPOPT_NOT_ADMIN		Users without administrator privileges cannot use the TCP Opti
 
 
 # Windows Vista / Windows 7 / Windows 8 Optimization
-VISTA_MMCSS_MSG			Do you wish to optimize Windows Vista / Windows 7 / Windows 8 for playing multimedia files with VPN? (e.g. videos, audios and streaming)
-VISTA_MMCSS_MSG_2		Optimization for Windows Vista / Windows 7 / Windows 8 with VPN has already done.\r\nDo you wish to remote optimized configuration?
+VISTA_MMCSS_MSG			Do you wish to optimize Windows Vista / Windows 7 / Windows 8 / Windows 10 for playing multimedia files with VPN? (e.g. videos, audios and streaming)
+VISTA_MMCSS_MSG_2		Optimization for Windows Vista / Windows 7 / Windows 8 / Windows 10 with VPN has already done.\r\nDo you wish to remote optimized configuration?
 VISTA_MMCSS_MSG_3		You cannot use optimization in currently environment.
-VISTA_MMCSS_MSG_4		You must have administrator privileges for this function.\r\nPlease note that in Windows Vista / Windows 7 / Windows 8 you should use "Run as Administrators" to execute program.
+VISTA_MMCSS_MSG_4		You must have administrator privileges for this function.\r\nPlease note that in Windows Vista / Windows 7 / Windows 8 / Windows 10 you should use "Run as Administrators" to execute program.
 VISTA_MMCSS_MSG_5		Optimization is finished.
 VISTA_MMCSS_MSG_6		Optimization configuration is removed.
 
@@ -3845,7 +3845,7 @@ S_TOOL					Sample File Generating Tool for OpenVPN Clients
 S_TOOL2					Making a OpenVPN Client configuration file is a very difficult job. You can use this tool to generate an appropriate OpenVPN Client configuration file. The generated configuration sample can be used immediately.
 B_CONFIG				Generate a Sample &Configuration File for OpenVPN Clients
 S_2						Microsoft SSTP VPN Clone Server Function
-S_3						This VPN Server has the clone functions of MS-SSTP VPN Server which is on Windows Server 2008 / 2012 by Microsoft Corporation.\r\nBuilt-in MS-SSTP Clients on Windows Vista / 7 / 8 / RT can connect to this VPN Server.
+S_3						This VPN Server has the clone functions of MS-SSTP VPN Server which is on Windows Server 2008 / 2012 by Microsoft Corporation.\r\nBuilt-in MS-SSTP Clients on Windows Vista / 7 / 8 / RT / 10 can connect to this VPN Server.
 R_SSTP					Enable &MS-SSTP VPN Clone Server Function
 S_SSTP					The value of CN (Common Name) on the SSL certificate of VPN Server must match to the hostname specified on the client, and that certificate must be in the trusted list on the client. For details refer the Microsoft's documents.
 S_4						The manner to specify a username to connect to the Virtual Hub, and the selection rule of default Hub by using these clone server functions are same to the IPsec Server functions.
@@ -4214,7 +4214,7 @@ CMD_SWITCH_SELECT		Sw&itch Selection
 # [View] menu
 CMD_TOP_VIEW			&View
 CMD_STATUSBAR			Show &Status Bar
-CMD_VISTASTYLE			Windows Vista / Windows 7 Styles
+CMD_VISTASTYLE			Windows Vista / 7 / 8 / 10 Styles
 CMD_SHOWPORT			Show &Ports on Connection List
 CMD_TRAYICON			Show Icons on &Task Tray
 CMD_ICON				&Icon
@@ -4239,7 +4239,7 @@ CMD_PASSWORD			Set &Password...\tCtrl+P
 CMD_TRUST				Manage &Trusted CA Certificate List\tCtrl+R
 CMD_NETIF				&Network Device Status...
 CMD_TCPIP				TCP Optimization &Utility...
-CMD_MMCSS				Optimization for Windows &Vista / 7 / 8...
+CMD_MMCSS				Optimization for Windows &Vista / 7 / 8 / 10...
 CMD_TRAFFIC				Network T&raffic Speed Test Tool...\tCtrl+Q 
 CMD_CM_SETTING			Switch Operation &Mode...
 CMD_LANGUAGE			&Language Settings...
@@ -6225,7 +6225,7 @@ CMD_OpenVpnMakeConfig_ERROR			The sample setting files were unable to be saved a
 
 # SstpEnable command
 CMD_SstpEnable			Enable / Disable Microsoft SSTP VPN Clone Server Function
-CMD_SstpEnable_Help		This VPN Server has the clone functions of MS-SSTP VPN Server which is on Windows Server 2008 / 2012 by Microsoft Corporation. Standard MS-SSTP Clients in Windows Vista / 7 / 8 / RT can connect to this VPN Server.\n\n[Caution]\nThe value of CN (Common Name) on the SSL certificate of VPN Server must match to the hostname specified on the client, and that certificate must be in the trusted list on the SSTP VPN client. For details refer the Microsoft's documents.\nYou can use the ServerCertRegenerate command to replace the current certificate on the VPN Server to a new self-signed certificate which has the CN (Common Name) value in the fields. In that case, you have to register such a new self-signed certificate on the SSTP VPN Client as a trusted root certificate. If you do not want to do such a bother tasks, please consider to purchase a SSL certificate provided by commercial authority such as VeriSign or GlobalSign.\n\nThe manner to specify a username to connect to the Virtual Hub, and the selection rule of default Hub by using this clone server functions are same to the IPsec Server functions. For details, please see the help of the IPsecEnable command.\n\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.\nYou cannot execute this command for Virtual Hubs of VPN Servers operating as a cluster.
+CMD_SstpEnable_Help		This VPN Server has the clone functions of MS-SSTP VPN Server which is on Windows Server 2008 / 2012 by Microsoft Corporation. Standard MS-SSTP Clients in Windows Vista / 7 / 8 / RT / 10 can connect to this VPN Server.\n\n[Caution]\nThe value of CN (Common Name) on the SSL certificate of VPN Server must match to the hostname specified on the client, and that certificate must be in the trusted list on the SSTP VPN client. For details refer the Microsoft's documents.\nYou can use the ServerCertRegenerate command to replace the current certificate on the VPN Server to a new self-signed certificate which has the CN (Common Name) value in the fields. In that case, you have to register such a new self-signed certificate on the SSTP VPN Client as a trusted root certificate. If you do not want to do such a bother tasks, please consider to purchase a SSL certificate provided by commercial authority such as VeriSign or GlobalSign.\n\nThe manner to specify a username to connect to the Virtual Hub, and the selection rule of default Hub by using this clone server functions are same to the IPsec Server functions. For details, please see the help of the IPsecEnable command.\n\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.\nYou cannot execute this command for Virtual Hubs of VPN Servers operating as a cluster.
 CMD_SstpEnable_Args		SstpEnable [yes|no]
 CMD_SstpEnable_[yes|no]	Specify yes to enable the Microsoft SSTP VPN Clone Server Function. Specify no to disable.
 CMD_SstpEnable_Prompt_[yes|no]	Enables SSTP VPN Clone Server Function (yes / no):