performance improve, it should working smooth on wooden pc.

Author: mrpond

README.md

@@ -3,8 +3,8 @@
   <h4 align="center">A multi-purpose adblocker and skip bypass for the <strong>Windows</strong> Spotify Desktop Application.</h4>
   <h5 align="center">Please support Spotify by purchasing premium</h5>
   <p align="center">
-    <strong>Current Version:</strong> 0.41 <br>
-    <strong>Last updated:</strong> 6 January 2020<br>
+    <strong>Current Version:</strong> 0.42 <br>
+    <strong>Last updated:</strong> 7 January 2020<br>
     <strong>Last tested version:</strong> 1.1.22.633.g1bab253a
   </p>
   <h4 align="center">Important Notice(s)</h4>
@@ -34,14 +34,16 @@
 3. Rename your backup dll to chrome_elf.dll
 
 #### Note:
+* Starting from v0.42, AdGuardDNS look up in config.ini are disable by default.
 * Built-in AdGuard DNS lookup, paranoid people may see additional DNS traffic UDP(53) 
 going out to Adguard DNS Server.
 * if you can't reach AdGuard DNS for some reason, things still working as expected.
 
 #### Known Issues and Caveats:
-* Ads Blocking may not work if you had proxy use in network.
+* Ads banner maybe appear if you network use 'Web Proxy Auto-Discovery Protocol'
+https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol
 set Skip_wpad in config.ini to 1 may help.
-* Ads Blocking on system may not work e.g.(windows 7)
+* On windows 7, Ads Blocking may not work
 set WinHttpReadDataFix in config.ini to 1 may help.
 * Built-in AdGuard DNS lookup, maybe cause application slowdown,
 set AdGuardDNS in config.ini to 0 to turn this feature off.

chrome_elf.zip

@@ -79,7 +79,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,1
- PRODUCTVERSION 0,41,0,0
+ PRODUCTVERSION 0,42,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -100,7 +100,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "BlockTheSpot.dll"
             VALUE "ProductName", "BlockTheSpot"
-            VALUE "ProductVersion", "0.41.0.0"
+            VALUE "ProductVersion", "0.42.0.0"
         END
     END
     BLOCK "VarFileInfo"

src/Resource.rc

@@ -9,7 +9,6 @@ extern bool g_WinHttpReadDataFix;
 extern std::ofstream Log_DNS;
 extern std::ofstream Log_GetAddr;
 extern std::ofstream Log_WinHttp;
-extern std::vector<std::string> blacklist;
 
 PIP4_ARRAY pSrvList = nullptr;
 
@@ -68,8 +67,7 @@ BOOL APIENTRY DllMain (HMODULE hModule,
 				if (g_Log)
 					Log_DNS << "AdGuard DNS Disable - pSrvList LocalAlloc failed!\n";
 			}
-			// Web Proxy Auto-Discovery (WPAD)
-			if (g_Skip_wpad) blacklist.push_back ("wpad");
+
 			// block ads banner by hostname.
 			InstallHookApi ("ws2_32.dll", "getaddrinfo", getaddrinfohook);
 			// block ads by manipulate json response.

src/dllmain.cpp

@@ -18,20 +18,10 @@ std::vector<std::string> whitelist;
 // blogs.msdn.microsoft.com/winsdk/2014/12/17/
 // dnsquery-sample-to-loop-through-multiple-ip-addresses/
 
-bool adguard_dnsblock (const char* nodename) {
+int adguard_dnsblock (const char* nodename) {
 	DNS_STATUS dnsStatus;
 	PDNS_RECORD QueryResult;
 	bool isBlock = false;
-	static int fail_count = 0;
-	if (!g_UseAdGuard) return false;
-
-	if (fail_count > 5) {
-		if (g_Log) {
-			Log_DNS << "AdGuard DNS lookup disable! fail resolve > 5 times" << std::endl;
-		}
-		g_UseAdGuard = false;
-		return false;
-	}
 
 	dnsStatus = DnsQuery (nodename,
 						  DNS_TYPE_A,
@@ -40,70 +30,77 @@ bool adguard_dnsblock (const char* nodename) {
 						  &QueryResult,
 						  NULL); // Reserved
 
+	if (0 != dnsStatus) return -1;
+
 	if (0 == dnsStatus) {
 		if (QueryResult) {
 			for (auto p = QueryResult; p; p = p->pNext) {
-				if (0 == p->Data.A.IpAddress) {
+				if (INADDR_ANY == p->Data.A.IpAddress) {
 					isBlock = true; // AdGuard Block
 					break;	// no more processing
 				}
 			}
 			DnsRecordListFree (QueryResult, DnsFreeRecordList);
 		} // QueryResult
 	}
-	else { // dnsStatus
-		fail_count++;
-	}
-	if (g_Log && isBlock) {
-		Log_DNS << nodename << " blocked" << std::endl;
-	}
+
 	if (isBlock) {
-		blacklist.push_back (nodename); // add to blacklist
-	}
-	else {
-		whitelist.push_back (nodename); // add to whitelist
+		return 1;
 	}
-	return isBlock;
+	return 0;
 }
 
 bool checkBlock (const char* nodename) {
 
 	if (nullptr != strstr (nodename, "google"))
 		return true;
 
-	for (auto allow : whitelist) {
-		if (0 == _stricmp (allow.c_str (), nodename))
-			return false;
-	}
+	// AdGuard DNS
+	if (g_UseAdGuard) {
+		for (auto allow : whitelist) {
+			if (0 == _stricmp (allow.c_str (), nodename))
+				return false;
+		}
 
-	for (auto block : blacklist) {
-		if (0 == _stricmp (block.c_str (), nodename))
-			return true;
-	}
+		for (auto block : blacklist) {
+			if (0 == _stricmp (block.c_str (), nodename))
+				return true;
+		}
 
-	// AdGuard DNS
-	if (adguard_dnsblock (nodename)) {
-		return true;
+		int result = adguard_dnsblock (nodename);
+		if (1 == result) {
+			blacklist.push_back (nodename); // add to blacklist
+			return true;
+		}
+		else if (0 == result) {
+			whitelist.push_back (nodename); // add to whitelist
+		}
 	}
-
 	return false;
 }
+
 int WINAPI getaddrinfohook (DWORD RetAddr,
 							pfngetaddrinfo fngetaddrinfo,
 							const char* nodename,
 							const char* servname,
 							const struct addrinfo* hints,
 							struct addrinfo** res)
 {
+
 	auto result = fngetaddrinfo (nodename,
 								 servname,
 								 hints,
 								 res);
-	addrinfo* p = *res;
-	if (0 == result && nullptr != p) { // GetAddrInfo return 0 on success
-		if (p->ai_family == AF_INET && checkBlock (nodename)) {
-			struct sockaddr_in* ipv4 = (struct sockaddr_in*)p->ai_addr;
-			InetPton (AF_INET, "0.0.0.0", &(ipv4->sin_addr));
+
+	if (0 == result) { // GetAddrInfo return 0 on success
+		// Web Proxy Auto-Discovery (WPAD)
+		if (g_Skip_wpad && 0 == _stricmp (nodename, "wpad"))
+			return WSAHOST_NOT_FOUND;
+		if (checkBlock (nodename)) {
+			for (auto ptr = *res; nullptr != ptr; ptr = ptr->ai_next) {
+				auto ipv4 = (struct sockaddr_in*)ptr->ai_addr;
+				ipv4->sin_addr.S_un.S_addr = INADDR_ANY;
+			}
 			if (g_Log) {
 				Log_GetAddr << nodename << " blocked" << std::endl;
 			}