Added exported function to check pdb download state, downloading functions now wait until a connection has been established

Author: Broihon

GH Injector Library/Import Handler WOW64.cpp

@@ -112,7 +112,7 @@ DWORD ResolveImports_WOW64(ERROR_DATA & error_data)
 		return INJ_ERR_WOW64_NTDLL_MISSING;
 	}
 
-	if (sym_ntdll_wow64_ret.wait_for(std::chrono::milliseconds(100)) != std::future_status::ready)
+	if (sym_ntdll_wow64_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
 	{
 		INIT_ERROR_DATA(error_data, INJ_ERR_ADVANCED_NOT_DEFINED);
 

GH Injector Library/Import Handler.cpp

@@ -31,7 +31,7 @@ DWORD ResolveImports(ERROR_DATA & error_data)
 	WIN32_FUNC_INIT(GetLastError, hK32);
 	if (!NATIVE::pLoadLibraryExW || !NATIVE::pGetLastError) return INJ_ERR_GET_PROC_ADDRESS_FAIL;	
 
-	if (sym_ntdll_native_ret.wait_for(std::chrono::milliseconds(100)) != std::future_status::ready)
+	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

@@ -531,4 +531,35 @@ HRESULT __stdcall GetVersionW(wchar_t * out, size_t cb_size)
 	}
 
 	return StringCbCopyW(out, cb_size, GH_INJ_VERSIONW);
+}
+
+DWORD __stdcall GetSymbolState()
+{
+#pragma EXPORT_FUNCTION(__FUNCTION__, __FUNCDNAME__)
+
+	if (sym_ntdll_native_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
+	{
+		return INJ_ERR_SYMBOL_INIT_NOT_DONE;
+	}
+
+	DWORD sym_ret = sym_ntdll_native_ret.get();
+	if (sym_ret != SYMBOL_ERR_SUCCESS)
+	{
+		return sym_ret;
+	}
+
+#ifdef _WIN64
+	if (sym_ntdll_wow64_ret.wait_for(std::chrono::milliseconds(0)) != std::future_status::ready)
+	{
+		return INJ_ERR_SYMBOL_INIT_NOT_DONE;
+	}
+
+	sym_ret = sym_ntdll_wow64_ret.get();
+	if (sym_ret != SYMBOL_ERR_SUCCESS)
+	{
+		return sym_ret;
+	}
+#endif
+
+	return SYMBOL_ERR_SUCCESS;
 }

GH Injector Library/Injection.h

@@ -81,4 +81,8 @@ DWORD __stdcall InjectW(INJECTIONDATAW * pData);
 
 //Returns the version string of the current instance
 HRESULT __stdcall GetVersionA(char		* out, size_t cb_size);
-HRESULT __stdcall GetVersionW(wchar_t	* out, size_t cb_size);
+HRESULT __stdcall GetVersionW(wchar_t	* out, size_t cb_size);
+
+//Returns the state of the symbol download threads
+//If finished SYMBOL_ERR_SUCCESS (0) is returned 
+DWORD __stdcall GetSymbolState();

GH Injector Library/Symbol Parser.cpp

@@ -124,7 +124,7 @@ bool SYMBOL_PARSER::VerifyExistingPdb(const GUID & guid)
 	return (guid_eq == 0);
 }
 
-DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::string path, std::string * pdb_path_out, bool Redownload)
+DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::string path, std::string * pdb_path_out, bool Redownload, bool WaitForConnection)
 {
 	if (m_Initialized)
 	{
@@ -325,8 +325,17 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		url += '/';
 		url += pdb_info->PdbFileName;
 
+		if (WaitForConnection)
+		{
+			while (InternetCheckConnectionA("https://msdl.microsoft.com", FLAG_ICC_FORCE_CONNECTION, NULL) == FALSE)
+			{
+				Sleep(25);
+			}
+		}
+
 		if (FAILED(URLDownloadToFileA(nullptr, url.c_str(), m_szPdbPath.c_str(), NULL, nullptr)))
 		{
+			MessageBoxA(0, "Feels bad man", 0, 0);
 			VirtualFree(pLocalImageBase, 0, MEM_RELEASE);
 
 			delete[] pRawData;

GH Injector Library/Symbol Parser.h

@@ -24,7 +24,7 @@ class SYMBOL_PARSER
 	SYMBOL_PARSER();
 	~SYMBOL_PARSER();
 
-	DWORD Initialize(const std::string szModulePath, const std::string path, std::string * pdb_path_out, bool Redownload);
+	DWORD Initialize(const std::string szModulePath, const std::string path, std::string * pdb_path_out, bool Redownload, bool WaitForConnection = false);
 	DWORD GetSymbolAddress(const char * szSymbolName, DWORD & RvaOut);
 };
 

GH Injector Library/main.cpp

@@ -60,13 +60,13 @@ BOOL WINAPI DllMain(HINSTANCE hDll, DWORD dwReason, void * pReserved)
 		std::string szNtDllWOW64 = szWindowsDir;
 		szNtDllWOW64 += "\\SysWOW64\\ntdll.dll";
 
-		sym_ntdll_wow64_ret	= std::async(std::launch::async, &SYMBOL_PARSER::Initialize, &sym_ntdll_wow64, szNtDllWOW64, g_RootPathA, nullptr, false);
+		sym_ntdll_wow64_ret	= std::async(std::launch::async, &SYMBOL_PARSER::Initialize, &sym_ntdll_wow64, szNtDllWOW64, g_RootPathA, nullptr, false, true);
 #endif
 
 		std::string szNtDllNative = szWindowsDir;
 		szNtDllNative += "\\System32\\ntdll.dll";
 
-		sym_ntdll_native_ret = std::async(std::launch::async, &SYMBOL_PARSER::Initialize, &sym_ntdll_native, szNtDllNative, g_RootPathA, nullptr, false);
+		sym_ntdll_native_ret = std::async(std::launch::async, &SYMBOL_PARSER::Initialize, &sym_ntdll_native, szNtDllNative, g_RootPathA, nullptr, false, true);
 
 		delete[] szWindowsDir;
 	}

GH Injector Library/pch.cpp

@@ -3,6 +3,7 @@
 #pragma comment(lib, "wtsapi32.lib")
 #pragma comment(lib, "DbgHelp.lib")
 #pragma comment(lib, "Urlmon.lib")
+#pragma comment(lib, "WinInet.lib")
 
 #if (PSAPI_VERSION == 1)
 #pragma comment(lib, "Psapi.lib")

GH Injector Library/pch.h

@@ -27,6 +27,9 @@
 #include <urlmon.h>
 #include <future>
 
+//internet shit
+#include <WinInet.h>
+
 //warning shit
 #pragma warning(disable: 4201) //unnamed union
 #pragma warning(disable: 4324) //structure member alignment resulting in additional bytes being added as padding

Injection.h

@@ -141,4 +141,6 @@ using f_ValidateInjectionFunctions = bool(__stdcall*)(DWORD dwTargetProcessId, D
 using f_RestoreInjectionFunctions = bool(__stdcall*)(DWORD dwTargetProcessId, DWORD & ErrorCode, DWORD & LastWin32Error, HookInfo * HookDataIn, UINT Count, UINT * CountOut);
 
 using f_GetVersionA = HRESULT(__stdcall *)(char		* out, size_t cb_size);
-using f_GetVersionW = HRESULT(__stdcall *)(wchar_t	* out, size_t cb_size);
+using f_GetVersionW = HRESULT(__stdcall *)(wchar_t	* out, size_t cb_size);
+
+using f_GetSymbolState = DWORD(__stdcall *)();