Close #23

* Replace NULL to _pNULL_
* Decrease warning line to 3
* Add easy function in download.hpp

README.md

@@ -3,9 +3,9 @@
 # Download Executable File 
 
 [![Build status](https://ci.appveyor.com/api/projects/status/8aya86796ipmuwr2/branch/master?svg=true)](https://ci.appveyor.com/project/Too-Naive/windows/branch/master)
-Last update: Sept. 11th , 2016
+Last update: Sept. 17th , 2016
 
-#### 下载地址:(v2.1.15)
+#### 下载地址:(v2.1.16)
 
  - zip Package (Include `tool.exe` and `choose.exe`)
   - [点我来下载](https://git.io/vozMx)

hander/default.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <tchar.h>
-const TCHAR *szDefatult_hostsfile=_T("\
+const TCHAR * szDefatult_hostsfile=_T("\
 # Copyright (c) 1993-2009 Microsoft Corp.\n\
 #\n\
 # This is a sample HOSTS file used by Microsoft TCP/IP for Windows.\n\

hander/download.hpp

@@ -8,7 +8,7 @@
 //Code:https://raw.githubusercontent.com/Too-Naive/Tools/master/download.hpp
 
 #pragma once
-
+ 
 #include <windows.h>
 #include <wininet.h>
 #include <tchar.h>
@@ -19,6 +19,18 @@
 #pragma comment(lib,"wininet.lib")
 #endif
 
+//define _pNULL_
+#ifndef _pNULL_
+	#if (defined(__GXX_EXPERIMENTAL_CXX0X__)||\
+	    (defined(_MSC_VER)&&(_MSC_VER>=1800)))
+		#define _pNULL_ nullptr
+	#else
+		#define _pNULL_ NULL
+	#endif
+#endif
+//end
+
+
 #define ___userAgent TEXT("Mozilla/4.0 (compatible; Windows NT 6.1)")
 
 bool Func_DownloadEx(const TCHAR * url,const TCHAR * file,const DWORD FileAttributes){
@@ -28,25 +40,34 @@ bool Func_DownloadEx(const TCHAR * url,const TCHAR * file,const DWORD FileAttrib
 	char szBuffer[dwBuffer]="";		//read buff
 	HANDLE hdFile=INVALID_HANDLE_VALUE;	//file handle
 	//bug check begin
-	if (!(hWeb=InternetOpen(___userAgent,INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0))) return false;
-	if (!(hRequest=InternetOpenUrl(hWeb,url,NULL,0,INTERNET_FLAG_DONT_CACHE,0))){
+	if (!(hWeb=InternetOpen(___userAgent,INTERNET_OPEN_TYPE_PRECONFIG,_pNULL_,_pNULL_,0))) return false;
+	if (!(hRequest=InternetOpenUrl(hWeb,url,_pNULL_,0,INTERNET_FLAG_DONT_CACHE,0))){
 		InternetCloseHandle(hWeb);
 		return false;
 	}
-	if ((hdFile=CreateFile(file,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FileAttributes,NULL))==INVALID_HANDLE_VALUE){
+	if ((hdFile=CreateFile(file,GENERIC_WRITE,0,_pNULL_,CREATE_ALWAYS,FileAttributes,_pNULL_))==INVALID_HANDLE_VALUE){
 		InternetCloseHandle(hWeb);
 		InternetCloseHandle(hRequest);
 		return false;
 	}
 	//end.
 	while (InternetReadFile(hRequest,(PVOID)szBuffer,dwBuffer,&dwReadByte) && dwReadByte)
-		WriteFile(hdFile,szBuffer,dwReadByte,&dwReserved,NULL);
+		WriteFile(hdFile,szBuffer,dwReadByte,&dwReserved,_pNULL_);
 	CloseHandle(hdFile);
 	InternetCloseHandle(hRequest);
 	InternetCloseHandle(hWeb);
 	return true;
 }
 
-inline bool __fastcall Func_Download(const TCHAR *url,const TCHAR *file){//for backward compatibility
+inline bool __fastcall Func_Download(const TCHAR * url,const TCHAR * file){//for backward compatibility
 	return Func_DownloadEx(url,file,FILE_ATTRIBUTE_NORMAL);
 }
+
+inline bool __fastcall Func_easyDownload(const TCHAR * url){
+	const TCHAR * _szLocate_=_pNULL_;
+	for (_szLocate_=url;*++_szLocate_;);
+	if (*--_szLocate_=='/') return false;
+	for (;*(--_szLocate_)!='/';);
+	_szLocate_++;
+	return Func_Download(url,_szLocate_);
+}

hander/pipedebug.hpp

@@ -9,6 +9,17 @@
 #include <stdio.h>
 #include <tchar.h>
 
+//define _pNULL_
+#ifndef _pNULL_
+	#if (defined(__GXX_EXPERIMENTAL_CXX0X__)||\
+	    (defined(_MSC_VER)&&(_MSC_VER>=1800)))
+		#define _pNULL_ nullptr
+	#else
+		#define _pNULL_ NULL
+	#endif
+#endif
+//end
+
 extern const TCHAR * pipeName;
 HANDLE hdPipe=INVALID_HANDLE_VALUE;
 extern void ___Func_pipeCallBack(TCHAR const *);
@@ -43,7 +54,7 @@ namespace __Dpipe{
 		LPPIPEINST lpPipeInst;
 		DWORD dwWait, cbRet;
 		BOOL fSuccess, fPendingIO;
-		if (!(hConnectEvent = CreateEvent(NULL,TRUE,TRUE,NULL)))
+		if (!(hConnectEvent = CreateEvent(_pNULL_,TRUE,TRUE,_pNULL_)))
 			return 0*_tprintf(_T("CreateEvent failed with %ld.\n"), GetLastError());
 		oConnect.hEvent = hConnectEvent;
 		fPendingIO = CreateAndConnectInstance(&oConnect);
@@ -96,15 +107,15 @@ namespace __Dpipe{
 		if (! DisconnectNamedPipe(lpPipeInst->hPipeInst))
 			printf("DisconnectNamedPipe failed with %ld.\n", GetLastError());
 		CloseHandle(lpPipeInst->hPipeInst);
-		if (lpPipeInst != NULL)
+		if (lpPipeInst != _pNULL_)
 			HeapFree(GetProcessHeap(),0, lpPipeInst);
 	}
 	BOOL CreateAndConnectInstance(LPOVERLAPPED lpoOverlap)
 	{
 		if (!(hdPipe = CreateNamedPipe(pipeName,PIPE_ACCESS_DUPLEX |FILE_FLAG_OVERLAPPED,
 			PIPE_TYPE_MESSAGE |	PIPE_READMODE_MESSAGE |	PIPE_WAIT,
 			PIPE_UNLIMITED_INSTANCES,BUFSIZE*sizeof(TCHAR),BUFSIZE*sizeof(TCHAR),
-			PIPE_TIMEOUT,NULL)))
+			PIPE_TIMEOUT,_pNULL_)))
 			return 0*(printf("CreateNamedPipe failed with %ld.\n", GetLastError()));
 		return ConnectToNewClient(hdPipe, lpoOverlap);
 	}
@@ -137,9 +148,11 @@ namespace __Dpipe{
 	HANDLE ___pipeopen(){
 		while (1){
 			if ((hdPipe = CreateFile(pipeName,GENERIC_READ|GENERIC_WRITE,0,
-				NULL,OPEN_EXISTING,0,NULL))!=INVALID_HANDLE_VALUE)
+				_pNULL_,OPEN_EXISTING,0,_pNULL_))!=INVALID_HANDLE_VALUE)
 				break;
 			if (GetLastError()!=ERROR_PIPE_BUSY) {
+#include "ptrerr.hpp"
+#pragma message("other hander file request")
 				Func_FastPMNTS(_T("%s Error! (%ld)\n"),_T("___pipeopen()"),GetLastError());
 				return INVALID_HANDLE_VALUE;
 			}
@@ -150,10 +163,10 @@ namespace __Dpipe{
 	extern DWORD ___OnError(const TCHAR *);
 	DWORD ___pipesendmsg(const TCHAR * szSent){
 		DWORD dwReserved=PIPE_READMODE_MESSAGE;
-	    if (!SetNamedPipeHandleState(hdPipe,&dwReserved,NULL,NULL))
+	    if (!SetNamedPipeHandleState(hdPipe,&dwReserved,_pNULL_,_pNULL_))
 	    	___OnError(_T("WriteFile"));
 //			Func_FastPMNTS(_T("SetNamedPipeHandleState() Error! (%ld)\n"),GetLastError());
-	    if (!WriteFile(hdPipe,szSent,(lstrlen(szSent)+1)*sizeof(TCHAR),&dwReserved,NULL))
+	    if (!WriteFile(hdPipe,szSent,(lstrlen(szSent)+1)*sizeof(TCHAR),&dwReserved,_pNULL_))
 	    	___OnError(_T("WriteFile"));
 //			Func_FastPMNTS(_T("WriteFile() Error! (%ld)\n"),GetLastError());
 	    return GetLastError();

tool.cpp

@@ -57,7 +57,7 @@
 #define objectwebsite _T("https:\x2f\x2fgithub.com/HostsTools/Windows")
 //end.
 
-#define ConsoleTitle _T("racaljk-host tool    v2.1.15  Build time:Sept. 11th, '16")
+#define ConsoleTitle _T("racaljk-host tool    v2.1.16  Build time:Sept. 17th, '16")
 
 #define CASE(x,y) case x : y; break;
 #define DEBUGCASE(x) CASE(x,___debug_point_reset(x))
@@ -407,7 +407,7 @@ void __abrt(int){
 }
 
 void __abrt1(int){
-	for (int i=70;i--;_tprintf(_T("Please check anti-virus software then open this program again.\n")));
+	for (int i=3;i--;_tprintf(_T("Please check anti-virus software then open this program again.\n")));
 }