0.37 WInhttp Option

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.36 <br>
-    <strong>Last updated:</strong> 17 November 2019 <br>
+    <strong>Current Version:</strong> 0.37 <br>
+    <strong>Last updated:</strong> 18 November 2019 <br>
     <strong>Last tested version:</strong> 1.1.19.480.g7d17e3ce
   </p>
   <h4 align="center">Important Notice(s)</h4>
@@ -41,5 +41,7 @@ going out to Adguard DNS Server.
 #### Known Issues and Caveats:
 * Ads Blocking may not work if you had proxy use in network.
 set Skip_wpad in config.ini to 1 may help.
+* Ads Blockng on system may not work e.g.(windows 7)
+set WinHttpReadDataFix in config.ini to 1 mayhelp
 * Built-in AdGuard DNS lookup, maybe cause application slowdown,
 set AdGuardDNS in config.ini to 0 to turn this feature off.

chrome_elf.zip

@@ -4,6 +4,7 @@
 extern bool g_UseAdGuard;
 extern bool g_Log;
 extern bool g_Skip_wpad;
+extern bool g_WinHttpReadDataFix;
 
 extern std::ofstream Log_DNS;
 extern std::ofstream Log_GetAddr;
@@ -18,14 +19,14 @@ BOOL APIENTRY DllMain (HMODULE hModule,
 	{
 	case DLL_PROCESS_ATTACH:
 		DisableThreadLibraryCalls (hModule);
-		if (GetPrivateProfileIntA ("Config", "AdGuardDNS", 1, "./config.ini") == 1)
-			g_UseAdGuard = true;
-		else
+		if (0 == GetPrivateProfileIntA ("Config", "AdGuardDNS", 1, "./config.ini"))
 			g_UseAdGuard = false;
-		if (GetPrivateProfileIntA ("Config", "Log", 0, "./config.ini") == 1)
+		if (0 < GetPrivateProfileIntA ("Config", "Log", 0, "./config.ini"))
 			g_Log = true;
-		if (GetPrivateProfileIntA ("Config", "Skip_wpad", 0, "./config.ini") == 1)
+		if (0 < GetPrivateProfileIntA ("Config", "Skip_wpad", 0, "./config.ini"))
 			g_Skip_wpad = true;
+		if (0 < GetPrivateProfileIntA ("Config", "WinHttpReadDataFix", 0, "./config.ini"))
+			g_WinHttpReadDataFix = true;
 
 		if (g_Log) {
 			Log_DNS.open ("log_dnsquery.txt",
@@ -34,7 +35,10 @@ BOOL APIENTRY DllMain (HMODULE hModule,
 							  std::ios::out | std::ios::app);
 			Log_WinHttp.open ("log_winhttp.txt",
 							  std::ios::out | std::ios::app);
+			if (!g_UseAdGuard)
+				Log_DNS << "AdGuard DNS Disable!\n";
 		}
+		
 		// block ads banner by hostname.
 		InstallHookApi ("ws2_32.dll", "getaddrinfo", getaddrinfohook);
 		// block ads by manipulate json response.

src/dllmain.cpp

@@ -3,6 +3,7 @@
 bool g_UseAdGuard = true;
 bool g_Log = false;
 bool g_Skip_wpad = false;
+bool g_WinHttpReadDataFix = false;
 
 std::ofstream Log_DNS;
 std::ofstream Log_GetAddr;
@@ -66,20 +67,23 @@ int WINAPI getaddrinfohook (DWORD RetAddr,
 							const struct addrinfo* hints,
 							struct addrinfo** res)
 {
+
+	// Web Proxy Auto-Discovery (WPAD)
+	if (g_Skip_wpad) {
+		if (0 == _stricmp (nodename, "wpad"))
+			return WSANO_RECOVERY;
+	}
+
+	if (NULL != strstr (nodename, "google"))
+		return WSANO_RECOVERY;
+
 	auto result = fngetaddrinfo (nodename,
 								 servname,
 								 hints,
 								 res);
 
 	// GetAddrInfo return 0 on success
 	if (0 == result) {
-		// Web Proxy Auto-Discovery (WPAD)
-		if (0 == _stricmp (nodename, "wpad"))
-			return g_Skip_wpad ? WSANO_RECOVERY : result;
-
-		if (NULL != strstr (nodename, "google"))
-			return WSANO_RECOVERY;
-
 		// AdGuard DNS
 		if (adguard_dnsblock (nodename))
 			return WSANO_RECOVERY;
@@ -121,6 +125,8 @@ int WINAPI winhttpreaddatahook (DWORD RetAddr,
 		Log_WinHttp << "Byte count: " << dwNumberOfBytesToRead << '\n';
 		Log_WinHttp << data << '\n';
 	}
+	if (g_WinHttpReadDataFix) return false;
+
 	SecureZeroMemory (lpBuffer, dwNumberOfBytesToRead);
 	return true;
 }