0.36

Author: mrpond

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,4 +16,5 @@ A clear and concise description of what the bug is.
 
 **Additional context**
 Make sure you use [latest blockthespot](https://github.com/mrpond/BlockTheSpot/releases) before report a bug.
-Add any other context about the problem here. If ad blocking is not working, please include a [ListDLLs](https://docs.microsoft.com/en-us/sysinternals/downloads/listdlls) log by running `listdlls Spotify.exe` with Spotify running in the background.
+Add any other context about the problem here. If ad blocking is not working, please include a debug Log
+by edit config.ini and set Log = 1 after ads play close spotify and zip the log_*.txt.

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.35 <br>
-    <strong>Last updated:</strong> 16 November 2019 <br>
+    <strong>Current Version:</strong> 0.36 <br>
+    <strong>Last updated:</strong> 17 November 2019 <br>
     <strong>Last tested version:</strong> 1.1.19.480.g7d17e3ce
   </p>
   <h4 align="center">Important Notice(s)</h4>
@@ -26,17 +26,17 @@
 1. Browse to Spotify installation folder `%APPDATA%/Spotify`
 2. Backup existing `chrome_elf.dll` by renaming it (e.g. chrome_elf.bak)
 3. Download [chrome_elf.zip](chrome_elf.zip)
-4. Extract chrome_elf.dll from chrome_elf.zip to that folder. 
+4. Extract chrome_elf.dll, config.ini from chrome_elf.zip to that folder. 
 
 #### Uninstall:
 1. Browse to Spotify installation folder `%APPDATA%/Spotify` 
-2. Simply delete chrome_elf.dll from your Spotify installation
+2. Simply delete chrome_elf.dll, config.ini from your Spotify installation
 3. Rename your backup dll to chrome_elf.dll
 
 #### Note:
 * 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.
+* 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.

src/hosts.cpp

@@ -19,43 +19,43 @@ bool adguard_dnsblock (const char* nodename) {
 	PIP4_ARRAY pSrvList = NULL;
 	bool isBlock = false;
 
+	if (!g_UseAdGuard) return false;
+	
 	pSrvList = (PIP4_ARRAY)LocalAlloc (LPTR, sizeof (IP4_ARRAY));
 
-	while (pSrvList) {
-
-		if (inet_pton (AF_INET,
-					   g_DNSIP, // dns server ip
-					   &pSrvList->AddrArray[0]) != 1)
-			break;
-		pSrvList->AddrCount = 1;
-
-		dnsStatus = DnsQuery_A (nodename,
-								DNS_TYPE_A,
-								DNS_QUERY_WIRE_ONLY,
-								pSrvList,
-								&QueryResult,
-								NULL); // Reserved
-
-		// DnsQuery return 0 - success
-		if (dnsStatus) {
-			if (g_Log) {
-				Log_DNS << nodename << " DNS status: " << dnsStatus
-					<< " GLE: " << GetLastError () << '\n';
-			}
-			break;
+	if (pSrvList) {
+		
+		if (0 == InetPtonA (AF_INET,
+							"176.103.130.134", // dns server ip
+							&pSrvList->AddrArray[0])) {
+			// "Family protection"
+			// adguard.com/en/adguard-dns/overview.html 
+			pSrvList->AddrCount = 1;
+
+			dnsStatus = DnsQuery_A (nodename,
+									DNS_TYPE_A,
+									DNS_QUERY_WIRE_ONLY,
+									pSrvList,
+									&QueryResult,
+									NULL); // Reserved
+			if (0 == dnsStatus) {
+				if (QueryResult) {
+					for (auto p = QueryResult; p; p = p->pNext) {
+						// 0.0.0.0
+						if (p->Data.A.IpAddress == 0)
+							isBlock = true; // AdGuard Block
+					}
+					DnsRecordListFree (QueryResult, DnsFreeRecordList);
+				} // QueryResult
+			} // dnsStatus
+		} // inet_pton
+
+		LocalFree (pSrvList);
+
+		if (g_Log && isBlock) {
+			Log_DNS << nodename << " blocked" << '\n';
 		}
-
-		if (!QueryResult) break;
-
-		for (auto p = QueryResult; p; p = p->pNext) {
-			// 0.0.0.0
-			if (p->Data.A.IpAddress == 0) isBlock = true; // AdGuard Block
-		}
-		DnsRecordListFree (QueryResult, DnsFreeRecordList);
-		break;
-	}
-
-	if (pSrvList) LocalFree (pSrvList);
+	} // pSrvList
 	return isBlock;
 }
 
@@ -72,24 +72,23 @@ int WINAPI getaddrinfohook (DWORD RetAddr,
 								 res);
 
 	// GetAddrInfo return 0 on success
-	if (result != 0) return result;
-
-	// Web Proxy Auto-Discovery (WPAD)
-	if (_stricmp (nodename, "wpad") == 0)
-		return g_Skip_wpad ? WSANO_RECOVERY : result;
+	if (0 == result) {
+		// Web Proxy Auto-Discovery (WPAD)
+		if (0 == _stricmp (nodename, "wpad"))
+			return g_Skip_wpad ? WSANO_RECOVERY : result;
 
-	if (strstr (nodename, "google") != NULL)
-		return WSANO_RECOVERY;
+		if (NULL != strstr (nodename, "google"))
+			return WSANO_RECOVERY;
 
-	// AdGuard DNS
-	if (g_UseAdGuard) {
+		// AdGuard DNS
 		if (adguard_dnsblock (nodename))
 			return WSANO_RECOVERY;
-	}
 
-	if (g_Log) {
-		Log_GetAddr << nodename << '\n';
+		if (g_Log) {
+			Log_GetAddr << nodename << '\n';
+		}
 	}
+
 	return result;
 }
 

src/hosts.h

@@ -1,10 +1,6 @@
 #ifndef _HOSTS_H
 #define _HOSTS_H
 
-// "Family protection"
-// adguard.com/en/adguard-dns/overview.html 
-static const char* g_DNSIP = "176.103.130.134";
-
 typedef int (__stdcall* pfngetaddrinfo)(const char* nodename,
 										const char* servname,
 										const struct addrinfo* hints,