Formatting, fixed check in SymbolParser (now releases dependencies properly)

Author: Broihon

GH Injector Library/Import Handler.cpp

@@ -29,8 +29,11 @@ DWORD ResolveImports(ERROR_DATA & error_data)
 
 	WIN32_FUNC_INIT(LoadLibraryExW, hK32);
 	WIN32_FUNC_INIT(GetLastError, hK32);
-	if (!NATIVE::pLoadLibraryExW || !NATIVE::pGetLastError) return INJ_ERR_GET_PROC_ADDRESS_FAIL;	
-	
+	if (!NATIVE::pLoadLibraryExW || !NATIVE::pGetLastError)
+	{
+		return INJ_ERR_GET_PROC_ADDRESS_FAIL;
+	}
+
 	if (sym_ntdll_native_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
 	{
 		INIT_ERROR_DATA(error_data, INJ_ERR_ADVANCED_NOT_DEFINED);

GH Injector Library/Injection.cpp

@@ -395,7 +395,7 @@ DWORD HijackHandle(INJECTIONDATAW * pData, ERROR_DATA & error_data)
 
 	DWORD LastErrCode	= INJ_ERR_SUCCESS;
 	HANDLE hHijackProc	= nullptr;
-	for (auto i : handles)
+	for (const auto & i : handles)
 	{
 		hHijackProc = OpenProcess(access_mask | PROCESS_CREATE_THREAD, FALSE, i.OwnerPID);
 		if (!hHijackProc)

GH Injector Library/Symbol Parser.cpp

@@ -146,6 +146,8 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		return SYMBOL_ERR_ALREADY_INITIALIZED;
 	}
 
+	m_bInterruptEvent = false;
+
 	std::ifstream File(szModulePath, std::ios::binary | std::ios::ate);
 	if (!File.good())
 	{
@@ -343,7 +345,7 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		{
 			while (InternetCheckConnectionA("https://msdl.microsoft.com", FLAG_ICC_FORCE_CONNECTION, NULL) == FALSE)
 			{
-				Sleep(50);
+				Sleep(25);
 
 				if (m_bInterruptEvent)
 				{
@@ -415,6 +417,8 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		return SYMBOL_ERR_SYM_INIT_FAIL;
 	}
 
+	m_Initialized = true;
+
 	SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS);
 
 	m_SymbolTable = SymLoadModuleEx(m_hProcess, nullptr, m_szPdbPath.c_str(), nullptr, 0x10000000, Filesize, nullptr, NULL);
@@ -464,6 +468,8 @@ DWORD SYMBOL_PARSER::GetSymbolAddress(const char * szSymbolName, DWORD & RvaOut)
 
 void SYMBOL_PARSER::Interrupt()
 {
+	m_bInterruptEvent = true;
+
 	if (m_hInterruptEvent)
 	{
 		SetEvent(m_hInterruptEvent);
@@ -496,6 +502,5 @@ void SYMBOL_PARSER::Interrupt()
 	m_hPdbFile		= nullptr;
 	m_hProcess		= nullptr;
 
-	m_bInterruptEvent = false;
 	m_hInterruptEvent = nullptr;
 }

GH Injector Library/main.cpp

@@ -84,20 +84,22 @@ BOOL WINAPI DllMain(HINSTANCE hDll, DWORD dwReason, void * pReserved)
 	{
 		LOG("GH Injector V%ls detaching\n", GH_INJ_VERSION);
 
-		if (sym_ntdll_native_ret.wait_for(std::chrono::microseconds(0)) != std::future_status::ready)
+		if (sym_ntdll_native_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
 		{
+			LOG("Attempting to interrupt native ntdll.pdb donwload thread\n");
 			sym_ntdll_native.Interrupt();
-			if (sym_ntdll_native_ret.wait_for(std::chrono::microseconds(25)) != std::future_status::timeout)
+			if (sym_ntdll_native_ret.wait_for(std::chrono::milliseconds(100)) != std::future_status::ready)
 			{
 				LOG("Native ntdll pdb download thread didn't exit properly.\n");
 			}
 		}
 
 #ifdef _WIN64
-		if (sym_ntdll_wow64_ret.wait_for(std::chrono::microseconds(0)) != std::future_status::ready)
+		if (sym_ntdll_wow64_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
 		{
+			LOG("Attempting to interrupt wow64 ntdll.pdb donwload thread\n");
 			sym_ntdll_wow64.Interrupt();
-			if (sym_ntdll_wow64_ret.wait_for(std::chrono::microseconds(25)) != std::future_status::timeout)
+			if (sym_ntdll_wow64_ret.wait_for(std::chrono::milliseconds(100)) != std::future_status::ready)
 			{
 				LOG("Wow64 ntdll pdb download thread didn't exit properly.\n");
 			}