Merge pull request #353 from CreationAugust/master

Windows console hosts tool Important update

Author: andytimes

hosts_tools/HostsToolforWindows/README.md

@@ -1,6 +1,6 @@
 # Download Executable File
 
-Download address:[hosts_tool.exe](https://git.io/vV2YO)
+Download address:[hosts_tool.exe](https://git.io/vVKmr)
 
 # Hosts Tool
 
@@ -22,7 +22,7 @@ main program file: `hosts_tool.exe`
 
 安装服务后 日志文件会保存在`c:\Hosts_Tool_log.log`下 您可以通过查看日志观察服务的工作状态
 
-卸载服务请使用原来的`hosts_tool.exe`文件 请不要在命令行中直接执行`hosts_tool -fu`
+卸载服务请使用原来的`hosts_tool.exe`文件 请不要在命令行中直接执行`hosts_tool -fu`(如执行 需要手动删除`%SystemRoot%`目录下的`hoststools.exe`)
 
 请间隔一段时间后清理`%SystemRoot%\system32\drivers\etc\`文件夹 (因为可能堆满了备份的文件)
 
@@ -51,7 +51,7 @@ windres hosts_tool.rc -o hosts_toolr.o
 g++ -o hosts_tool.exe hosts_tool.cpp hosts_toolr.o -lwininet -O2 -s
 ```
 
-`hosts_tool.exe.manifest`:
+File `hosts_tool.exe.manifest`:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

hosts_tools/HostsToolforWindows/hosts_tool.cpp

@@ -47,7 +47,7 @@ There seems something wrong in download file, we will retry after 5 seconds.\n")
 #define DownLocated _T(".\\hosts")
 #define ChangeCTLR _T(".\\hostsq")
 #define BAD_EXIT \
-		_tprintf(_T("Bad Parameters.\n")),\
+		_tprintf(_T("Bad Parameters.\nUsing [program-name] -? to show how to use.\n")),\
 		abort();
 const size_t localbufsize=1024;
 
@@ -98,7 +98,7 @@ int __fastcall __Check_Parameters(int,TCHAR const**);
 void WINAPI Service_Main(DWORD, LPTSTR *);
 void WINAPI Service_Control(DWORD);
 DWORD CALLBACK Main_Thread(LPVOID);
-void Func_Service_Install(const TCHAR *);
+void Func_Service_Install();
 void Func_Service_UnInstall();
 void NormalEntry();
 bool Func_CheckDiff(const TCHAR*,const TCHAR*) throw(expection);
@@ -112,15 +112,24 @@ TCHAR DEFBUF(buf1,localbufsize),DEFBUF(buf2,localbufsize),
 	DEFBUF(buf3,localbufsize),DEFBUF(szline,localbufsize);
 
 enum _Parameters{
-	EXEC_START_NORMAL		=1,
-//	EXEC_START_RUNAS		=2,
-	EXEC_START_SERVICE		=4,
-	EXEC_START_INSTALL_SERVICE	=8,
-	EXEC_START_UNINSTALL_SERVICE	=16,
-	EXEC_START_HELP			=32,
-	EXEC_DEBUG_RESET		=64,
-	SHOW_LICENSE			=128,
-	EXEC_BAD_PARAMETERS		=65536
+	EXEC_START_NORMAL		=1<<0x00,
+//	EXEC_START_RUNAS		=1<<0x01,
+	EXEC_START_SERVICE		=1<<0x02,
+	EXEC_START_INSTALL_SERVICE	=1<<0x03,
+	EXEC_START_UNINSTALL_SERVICE	=1<<0x04,
+	EXEC_START_HELP			=1<<0x05,
+	EXEC_DEBUG_RESET		=1<<0x06,
+	SHOW_LICENSE			=1<<0x07,
+	PARAMETERS_RESERVED1	=1<<0x08,
+	PARAMETERS_RESERVED2	=1<<0x09,
+	PARAMETERS_RESERVED3	=1<<0x0a,
+	PARAMETERS_RESERVED4	=1<<0x0b,
+	PARAMETERS_RESERVED5	=1<<0x0c,
+	PARAMETERS_RESERVED6	=1<<0x0d,
+	PARAMETERS_RESERVED7	=1<<0x0e,
+	PARAMETERS_RESERVED8	=1<<0x0f,
+	PARAMETERS_RESERVED9	=1<<0x10,
+	EXEC_BAD_PARAMETERS		=1073741824
 };
 
 
@@ -167,7 +176,7 @@ int _tmain(int argc,TCHAR const ** argv){
 	switch (__Check_Parameters(argc,argv)){
 /*		CASE(EXEC_START_NORMAL,Shell("-rrun"));
 		CASE(EXEC_START_RUNAS|EXEC_START_NORMAL,NormalEntry());
-		CASE(EXEC_START_RUNAS|EXEC_START_INSTALL_SERVICE,Func_Service_Install(argv[0]));
+		CASE(EXEC_START_RUNAS|EXEC_START_INSTALL_SERVICE,Func_Service_Install());
 		CASE(EXEC_START_RUNAS|EXEC_START_UNINSTALL_SERVICE,Func_Service_UnInstall());
 		CASE(EXEC_START_INSTALL_SERVICE,Shell("-rinstall"));
 		CASE(EXEC_START_UNINSTALL_SERVICE,Shell("-runinstall"));
@@ -177,7 +186,7 @@ int _tmain(int argc,TCHAR const ** argv){
 		_tprintf(_T("Bad Parameters."));
 		abort();*/
 		CASE(EXEC_START_NORMAL,NormalEntry());
-		CASE(EXEC_START_INSTALL_SERVICE,Func_Service_Install(argv[0]));
+		CASE(EXEC_START_INSTALL_SERVICE,Func_Service_Install());
 		CASE(EXEC_START_UNINSTALL_SERVICE,Func_Service_UnInstall());
 		CASE(EXEC_START_SERVICE,StartServiceCtrlDispatcher(STE));
 		CASE(EXEC_START_HELP,__show_str(SHOW_HELP,Sname));
@@ -260,16 +269,22 @@ void Func_Service_UnInstall(){
 	try{
 		if (!GetEnvironmentVariable(_T("SystemRoot"),buf2,BUFSIZ))
 			THROWERR(_T("GetEnvironmentVariable() Error in UnInstall Service."));
-		_stprintf(buf1,_T("%s\\hoststools.exe"),buf2);
+		_stprintf(buf1,_T("%s\\hoststools.exe"),buf2);/*
+		if (!GetModuleFileName(NULL,szline,sizeof(szline)/sizeof(TCHAR)));
+			THROWERR(_T("GetModuleFileName() Error in Uninstall Service."));
+		if (!_tcscmp(buf1,szline)) THROWERR(_T("Please"))*/
 		if (!(shMang=OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS)))
 			THROWERR(_T("OpenSCManager() Error in Uninstall service."));
 		if (!(shSvc=OpenService(shMang,Sname,SERVICE_ALL_ACCESS)))
 			THROWERR(_T("OpenService() Error in Uninstall service."));
 		if (!ControlService(shSvc,SERVICE_CONTROL_STOP,&ss))
 			THROWERR(_T("ControlService() Error in Uninstall service."));
-		Sleep(1000);//Wait for service stop
-		if (!DeleteService(shSvc))
-			THROWERR(_T("DeleteService() Error in UnInstall service."));
+		Sleep(2000);//Wait for service stop
+		if (!DeleteService(shSvc)){
+			_tprintf(_T("Executable File located:%s\n"),buf1);
+			THROWERR(_T("DeleteService() Error in UnInstall service.\n\
+You may should delete it manually."));
+		}
 		if (!DeleteFile(buf1))
 			THROWERR(_T("DeleteFile() Error in Uninstall service."));
 	}
@@ -315,7 +330,7 @@ Please contact the application's support team for more information.\n"),
 }
 
 
-void Func_Service_Install(const TCHAR * st){
+void Func_Service_Install(){
 	SC_HANDLE shMang=NULL,shSvc=NULL;
 	_tprintf(_T("    LICENSE:MIT LICENSE\n    Copyright (C) 2016 @Too-Naive\n\n"));
 	_tprintf(_T("    Bug report:sweheartiii[at]hotmail.com \n\t       Or open new issue\n\
@@ -325,8 +340,10 @@ void Func_Service_Install(const TCHAR * st){
 			THROWERR(_T("GetEnvironmentVariable() Error in Install Service."));
 		_stprintf(buf1,_T("%s\\hoststools.exe"),buf3);
 		_stprintf(buf2,_T("%s\\hoststools.exe -svc"),buf3);
+		if (GetModuleFileName(NULL,szline,sizeof(szline)/sizeof(TCHAR)))
+			THROWERR(_T("GetModuleFileName() Error in Install Service."));
 		_tprintf(_T("    Step1:Copy file.\n"));
-		if (!CopyFile(st,buf1,FALSE))
+		if (!CopyFile(szline,buf1,FALSE))
 			THROWERR(_T("CopyFile() Error in Install Service.(Is service has been installed?)"));
 		_tprintf(_T("    Step2:Connect to SCM.\n"));
 		if (!(shMang=OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS)))
@@ -417,8 +434,8 @@ DWORD __stdcall HostThread(LPVOID){
 		Func_FastPMNSS(_T("           Or open new issue.(https://github.com/racaljk/hosts)\n"));
 		Func_FastPMNTS(_T("Start replace hosts file.\n"));
 		try {
-			for (int _count=0;!Func_Download(hostsfile,DownLocated);_count++,Sleep(30000))
-				if (_count>2) for (_count=0;!Func_Download(hostsfile,DownLocated);_count++,Sleep(30000))
+			for (int _count=0;!Func_Download(hostsfile,DownLocated);_count++,Sleep(10000))
+				if (_count>2) for (_count=0;!Func_Download(hostsfile,DownLocated);_count++,Sleep(10000))
 						if (_count>2) THROWERR(_T("DownLoad hosts file Error!"));
 			if (!((fp=_tfopen(DownLocated,_T("r"))) && (_=_tfopen(ChangeCTLR,_T("w")))))
 				THROWERR(_T("Open file Error!"));
@@ -495,4 +512,3 @@ void WINAPI Service_Control(DWORD dwControl){
 	}
 	return ;
 }
-

hosts_tools/HostsToolforWindows/mitlicense.hpp

@@ -1,27 +1,27 @@
-#include <tchar.h>
-
-#pragma once
-
-TCHAR szMitLicenseRaw[]=_T("\n\
-The MIT License(MIT)(redefined£©\n\
-\n\
-Copyright(c) 2016 Too-Naive E-mail:[email protected]\n\
-\n\
-Permission is hereby granted, free of charge, to any person obtaining a copy\n\
-of this software and associated documentation files(the \"Software\"), to deal\n\
-in the Software without restriction, including without limitation the rights\n\
-to use, copy, modify, merge, publish, distribute, and to permit persons to \n\
-whom the Software is furnished to do so, BUT DO NOT SUBLICENSE, AND / OR SELL\n\
-OF THE SOFTWARE,subject to the following conditions :\n\
-\n\
-The above copyright notice and this permission notice shall be included in\n\
-all copies or substantial portions of the Software.\n\
-\n\
-THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n\
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n\
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n\
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n\
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n\
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n\
-SOFTWARE.\n\
-");
+#include <tchar.h>
+
+#pragma once
+
+TCHAR szMitLicenseRaw[]=_T("\n\
+The MIT License(MIT)(redefined)\n\
+\n\
+Copyright(c) 2016 Too-Naive E-mail:[email protected]\n\
+\n\
+Permission is hereby granted, free of charge, to any person obtaining a copy\n\
+of this software and associated documentation files(the \"Software\"), to deal\n\
+in the Software without restriction, including without limitation the rights\n\
+to use, copy, modify, merge, publish, distribute, and to permit persons to \n\
+whom the Software is furnished to do so, BUT DO NOT SUBLICENSE, AND / OR SELL\n\
+OF THE SOFTWARE,subject to the following conditions :\n\
+\n\
+The above copyright notice and this permission notice shall be included in\n\
+all copies or substantial portions of the Software.\n\
+\n\
+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n\
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n\
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n\
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n\
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n\
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n\
+SOFTWARE.\n\
+");

hosts_tools/README.md

@@ -21,7 +21,7 @@
 
 - HostToolforMac: Mac 环境下的 hosts 自动部署更新应用（适用于 OS X 10.10 或以上），基于 Swift 开发。由 @ZzzM 贡献。
 
-- HostsToolforWindows: Windows console环境下的 hosts 自动更新应用(作为系统服务)，使用 **C++**构建。由 @Too-Naive 贡献。
+- HostsToolforWindows: Windows console环境下的 hosts 自动更新应用(作为系统服务)，使用 **C++** 构建。由 @Too-Naive 贡献。
 
 - [`script_tool_for_windows.bat`](http://keving.pythonanywhere.com/hosts_scripts/script_tool_for_windows.bat): Windows 环境下的 hosts 一键部署脚本，由 @redapple0204 与 @lizongzeshunshun 贡献。以及 @lideming 提供的重要更新。