Fix

mrpond · Nov 15, 2019 · e2b54f2 · e2b54f2
1 parent 1688107
commit e2b54f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/chrome_elf.zip b/chrome_elf.zip
diff --git a/src/BlockTheSpot.vcxproj b/src/BlockTheSpot.vcxproj
@@ -81,7 +81,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <ExceptionHandling>false</ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -3,6 +3,8 @@
 
 extern bool g_UseAdGuard;
 extern bool g_Log;
+extern bool g_Skip_wpad;
+
 extern std::ofstream Log_DNS;
 extern std::ofstream Log_GetAddr;
 extern std::ofstream Log_WinHttp;
@@ -20,7 +22,9 @@ BOOL APIENTRY DllMain (HMODULE hModule,
 			g_UseAdGuard = true;
 		if (GetPrivateProfileIntA ("Config", "Log", 0, "./config.ini") == 1)
 			g_Log = true;
-
+		if (GetPrivateProfileIntA ("Config", "Skip_wpad", 0, "./config.ini") == 1)
+			g_Skip_wpad = true;
+
 		if (g_Log) {
 			Log_DNS.open ("log_dnsquery.txt",
 				std::ios::out | std::ios::app);

diff --git a/src/hosts.cpp b/src/hosts.cpp
@@ -2,7 +2,7 @@
 
 bool g_UseAdGuard = true;
 bool g_Log = false;
-bool openLog = false;
+bool g_Skip_wpad = false;
 
 std::ofstream Log_DNS;
 std::ofstream Log_GetAddr;
@@ -79,7 +79,7 @@ int WINAPI getaddrinfohook (DWORD RetAddr,
 
 	if (nodename == NULL) return ret;
 	// Web Proxy Auto-Discovery (WPAD)
-	if (_stricmp (nodename, "wpad") == 0) return ret; // experimental
+	if (_stricmp (nodename, "wpad") == 0) return g_Skip_wpad ? WSANO_RECOVERY : ret; // experimental
 	// change to WSANO_RECOVERY if you want to mess with proxy.
 
 	// issue free here, in the case that