kinda fixed problems with symbol parser resulting in deadlock (rip in pieces Download Manager. gone but not forgotten.

Author: Broihon

GH Injector Library/Download Manager.cpp

@@ -226,28 +226,29 @@
 //Symbol errors:
 #define SYMBOL_ERR_SUCCESS						0x00000000
 
-															//Source				:	error description
-#define SYMBOL_ERR_CANT_OPEN_MODULE				0x40000001	//std::ifstream::good	:	can't open the specified module
-#define SYMBOL_ERR_FILE_SIZE_IS_NULL			0x40000002	//std::ifstream::tellg	:	file size of the specified module is 0
-#define SYMBOL_ERR_CANT_ALLOC_MEMORY_NEW		0x40000003	//operator new			:	can't allocate memory
-#define SYMBOL_ERR_INVALID_FILE_ARCHITECTURE	0x40000004	//internal error		:	the architecture of the specified file doesn't match AMD64 or I386
-#define SYMBOL_ERR_CANT_ALLOC_MEMORY			0x40000005	//VirtualAlloc			:	can't allocate memory
-#define SYMBOL_ERR_NO_PDB_DEBUG_DATA			0x40000006	//internal error		:	debuge directory is emtpy or wrong type
-#define SYMBOL_ERR_PATH_DOESNT_EXIST			0x40000007	//CreateDirectoryA		:	path doesn't exit and can't be created
-#define SYMBOL_ERR_CANT_CREATE_DIRECTORY		0x40000008	//CreateDirectoryA		:	path doesn't exit and can't be created (x86/x64 subdirectory)
-#define SYMBOL_ERR_CANT_CONVERT_PDB_GUID		0x40000008	//StringFromGUID2		:	conversion of the GUID to string failed
-#define SYMBOL_ERR_GUID_TO_ANSI_FAILED			0x40000009	//wcstombs_s			:	conversion of GUID to ANSI string failed
-#define SYMBOL_ERR_DOWNLOAD_FAILED				0x4000000A	//URLDownloadToFileA	:	downloading the pdb file failed
-#define SYMBOL_ERR_CANT_ACCESS_PDB_FILE			0x4000000B	//GetFileAttributesExA	:	can't access the pdb file
-#define SYMBOL_ERR_CANT_OPEN_PDB_FILE			0x4000000C	//CreateFileA			:	can't open the pdb file
-#define SYMBOL_ERR_CANT_OPEN_PROCESS			0x4000000D	//OpenProcess			:	can't open handle to current process
-#define SYMBOL_ERR_SYM_INIT_FAIL				0x4000000E	//SymInitialize			:	couldn't initialize pdb symbol stuff
-#define SYMBOL_ERR_SYM_LOAD_TABLE				0x4000000F	//SymLoadModule64		:	couldn't load symbol table
-#define SYMBOL_ERR_ALREADY_INITIALIZED			0x40000010	//internal error		:	this instance of the SYMBOL_PARSER has already been initialized
-#define SYMBOL_ERR_NOT_INITIALIZED				0x40000011	//internal error		:	this isntance of the SYMBOL_PARSER hasn't benen initialized
-#define SYMBOL_ERR_IVNALID_SYMBOL_NAME			0x40000012	//internal error		:	szSymbolName is NULL
-#define SYMBOL_ERR_SYMBOL_SEARCH_FAILED			0x40000013	//SymFromName			:	couldn't find szSymbolName in the specified pdb
-#define SYMBOL_CANT_OPEN_PROCESS				0x40000014	//OpenProcess			:	can't get PROCESS_QUERY_LIMITED_INFORMATION handle to current process
+															//Source					:	error description
+#define SYMBOL_ERR_CANT_OPEN_MODULE				0x40000001	//std::ifstream::good		:	can't open the specified module
+#define SYMBOL_ERR_FILE_SIZE_IS_NULL			0x40000002	//std::ifstream::tellg		:	file size of the specified module is 0
+#define SYMBOL_ERR_CANT_ALLOC_MEMORY_NEW		0x40000003	//operator new				:	can't allocate memory
+#define SYMBOL_ERR_INVALID_FILE_ARCHITECTURE	0x40000004	//internal error			:	the architecture of the specified file doesn't match AMD64 or I386
+#define SYMBOL_ERR_CANT_ALLOC_MEMORY			0x40000005	//VirtualAlloc				:	can't allocate memory
+#define SYMBOL_ERR_NO_PDB_DEBUG_DATA			0x40000006	//internal error			:	debuge directory is emtpy or wrong type
+#define SYMBOL_ERR_PATH_DOESNT_EXIST			0x40000007	//CreateDirectoryA			:	path doesn't exit and can't be created
+#define SYMBOL_ERR_CANT_CREATE_DIRECTORY		0x40000008	//CreateDirectoryA			:	path doesn't exit and can't be created (x86/x64 subdirectory)
+#define SYMBOL_ERR_CANT_CONVERT_PDB_GUID		0x40000008	//StringFromGUID2			:	conversion of the GUID to string failed
+#define SYMBOL_ERR_GUID_TO_ANSI_FAILED			0x40000009	//wcstombs_s				:	conversion of GUID to ANSI string failed
+#define SYMBOL_ERR_DOWNLOAD_FAILED				0x4000000A	//URLDownloadToCacheFileA	:	downloading the pdb file failed
+#define SYMBOL_ERR_CANT_ACCESS_PDB_FILE			0x4000000B	//GetFileAttributesExA		:	can't access the pdb file
+#define SYMBOL_ERR_CANT_OPEN_PDB_FILE			0x4000000C	//CreateFileA				:	can't open the pdb file
+#define SYMBOL_ERR_CANT_OPEN_PROCESS			0x4000000D	//OpenProcess				:	can't open handle to current process
+#define SYMBOL_ERR_SYM_INIT_FAIL				0x4000000E	//SymInitialize				:	couldn't initialize pdb symbol stuff
+#define SYMBOL_ERR_SYM_LOAD_TABLE				0x4000000F	//SymLoadModule64			:	couldn't load symbol table
+#define SYMBOL_ERR_ALREADY_INITIALIZED			0x40000010	//internal error			:	this instance of the SYMBOL_PARSER has already been initialized
+#define SYMBOL_ERR_NOT_INITIALIZED				0x40000011	//internal error			:	this isntance of the SYMBOL_PARSER hasn't benen initialized
+#define SYMBOL_ERR_IVNALID_SYMBOL_NAME			0x40000012	//internal error			:	szSymbolName is NULL
+#define SYMBOL_ERR_SYMBOL_SEARCH_FAILED			0x40000013	//SymFromName				:	couldn't find szSymbolName in the specified pdb
+#define SYMBOL_CANT_OPEN_PROCESS				0x40000014	//OpenProcess				:	can't get PROCESS_QUERY_LIMITED_INFORMATION handle to current process
+#define SYMBOL_ERR_COPYFILE_FAILED				0x40000015	//CopyFileA					:	copying the file from the cache directory failed
 
 
 

GH Injector Library/Download Manager.h

@@ -164,7 +164,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Download Manager.h" />
     <ClInclude Include="Eject.h" />
     <ClInclude Include="Error.h" />
     <ClInclude Include="Handle Hijacking.h" />
@@ -182,7 +181,6 @@
     <ClInclude Include="WOW64 Shells.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Download Manager.cpp" />
     <ClCompile Include="Eject.cpp" />
     <ClCompile Include="Handle Hijacking.cpp" />
     <ClCompile Include="Hook Scanner WOW64.cpp" />

GH Injector Library/Error.h

@@ -81,9 +81,6 @@
     <ClInclude Include="WOW64 Shells.h">
       <Filter>Quelldateien\wow64\Injection Methods</Filter>
     </ClInclude>
-    <ClInclude Include="Download Manager.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Handle Hijacking.cpp">
@@ -164,8 +161,5 @@
     <ClCompile Include="Injection Generic WOW64.cpp">
       <Filter>Quelldateien\wow64\Injection Methods</Filter>
     </ClCompile>
-    <ClCompile Include="Download Manager.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

GH Injector Library/GH Injector Library.vcxproj

@@ -5,6 +5,7 @@
 SYMBOL_PARSER::SYMBOL_PARSER()
 {
 	m_Initialized	= false;
+	m_Ready			= false;
 	m_SymbolTable	= 0;
 	m_Filesize		= 0;
 	m_hPdbFile		= nullptr;
@@ -15,14 +16,22 @@ SYMBOL_PARSER::~SYMBOL_PARSER()
 {
 	if (m_Initialized)
 	{
-		SymUnloadModule64(m_hProcess, m_SymbolTable);
+		if (m_SymbolTable)
+		{
+			SymUnloadModule64(m_hProcess, m_SymbolTable);
+		}
 
 		SymCleanup(m_hProcess);
+	}
 
+	if (m_hProcess)
+	{
 		CloseHandle(m_hProcess);
-		CloseHandle(m_hPdbFile);
+	}
 
-		m_Initialized = false;
+	if (m_hPdbFile)
+	{
+		CloseHandle(m_hPdbFile);
 	}
 }
 
@@ -125,7 +134,7 @@ bool SYMBOL_PARSER::VerifyExistingPdb(const GUID & guid)
 
 DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::string path, std::string * pdb_path_out, bool Redownload, bool WaitForConnection)
 {
-	if (m_Initialized)
+	if (m_Ready)
 	{
 		return SYMBOL_ERR_ALREADY_INITIALIZED;
 	}
@@ -328,26 +337,27 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 			while (InternetCheckConnectionA("https://msdl.microsoft.com", FLAG_ICC_FORCE_CONNECTION, NULL) == FALSE)
 			{
 				Sleep(10);
+			}
+		}
 
-				if (WaitForSingleObject(DownloadManager::hInterrupEvent, 0) == WAIT_OBJECT_0)
-				{
-					VirtualFree(pLocalImageBase, 0, MEM_RELEASE);
+		char szCacheFile[MAX_PATH]{ 0 };
 
-					delete[] pRawData;
+		if (FAILED(URLDownloadToCacheFileA(nullptr, url.c_str(), szCacheFile, MAX_PATH , NULL, nullptr)))
+		{
+			VirtualFree(pLocalImageBase, 0, MEM_RELEASE);
 
-					return SYMBOL_ERR_DOWNLOAD_FAILED;
-				}
-			}
+			delete[] pRawData;
+
+			return SYMBOL_ERR_DOWNLOAD_FAILED;
 		}
 
-		DownloadManager dm;
-		if (FAILED(URLDownloadToFileA(nullptr, url.c_str(), m_szPdbPath.c_str(), NULL, &dm)))
+		if (!CopyFileA(szCacheFile, m_szPdbPath.c_str(), FALSE))
 		{
 			VirtualFree(pLocalImageBase, 0, MEM_RELEASE);
 
 			delete[] pRawData;
 
-			return SYMBOL_ERR_DOWNLOAD_FAILED;
+			return SYMBOL_ERR_COPYFILE_FAILED;
 		}
 	}
 
@@ -365,24 +375,24 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		Filesize = file_attr_data.nFileSizeLow;
 	}
 
-	HANDLE hPdbFile = CreateFileA(m_szPdbPath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, NULL, nullptr);
-	if (hPdbFile == INVALID_HANDLE_VALUE)
+	m_hPdbFile = CreateFileA(m_szPdbPath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, NULL, nullptr);
+	if (m_hPdbFile == INVALID_HANDLE_VALUE)
 	{
 		return SYMBOL_ERR_CANT_OPEN_PDB_FILE;
 	}
 
 	m_hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId());
 	if (!m_hProcess)
 	{
-		CloseHandle(hPdbFile);
+		CloseHandle(m_hPdbFile);
 
 		return SYMBOL_ERR_CANT_OPEN_PROCESS;
 	}
 
 	if (!SymInitialize(m_hProcess, m_szPdbPath.c_str(), FALSE))
 	{
 		CloseHandle(m_hProcess);
-		CloseHandle(hPdbFile);
+		CloseHandle(m_hPdbFile);
 
 		return SYMBOL_ERR_SYM_INIT_FAIL;
 	}
@@ -395,7 +405,7 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		SymCleanup(m_hProcess);
 
 		CloseHandle(m_hProcess);
-		CloseHandle(hPdbFile);
+		CloseHandle(m_hPdbFile);
 
 		return SYMBOL_ERR_SYM_LOAD_TABLE;
 	}
@@ -405,14 +415,14 @@ DWORD SYMBOL_PARSER::Initialize(const std::string szModulePath, const std::strin
 		*pdb_path_out = m_szPdbPath;
 	}
 
-	m_Initialized = true;
+	m_Ready = true;
 
 	return SYMBOL_ERR_SUCCESS;
 }
 
 DWORD SYMBOL_PARSER::GetSymbolAddress(const char * szSymbolName, DWORD & RvaOut)
 {
-	if (!m_Initialized)
+	if (!m_Ready)
 	{
 		return SYMBOL_ERR_NOT_INITIALIZED;
 	}
@@ -432,4 +442,34 @@ DWORD SYMBOL_PARSER::GetSymbolAddress(const char * szSymbolName, DWORD & RvaOut)
 	RvaOut = (DWORD)(si.Address - si.ModBase);
 
 	return SYMBOL_ERR_SUCCESS;
+}
+
+void SYMBOL_PARSER::InterruptCleanup()
+{
+	if (m_Initialized)
+	{
+		if (m_SymbolTable)
+		{
+			SymUnloadModule64(m_hProcess, m_SymbolTable);
+		}
+
+		SymCleanup(m_hProcess);
+	}
+
+	if (m_hProcess)
+	{
+		CloseHandle(m_hProcess);
+	}
+
+	if (m_hPdbFile)
+	{
+		CloseHandle(m_hPdbFile);
+	}
+	
+	m_Initialized	= false;
+	m_Ready			= false;
+	m_SymbolTable	= 0;
+	m_Filesize		= 0;
+	m_hPdbFile		= nullptr;
+	m_hProcess		= nullptr;
 }