Added option to query download status, small fixes in manual mapping and regular injection (peh header faking)

Author: Broihon

GH Injector Library/Download Manager.cpp

@@ -4,7 +4,8 @@
 
 DownloadManager::DownloadManager()
 {
-    m_hInterruptEvent = nullptr;
+    m_hInterruptEvent   = nullptr;
+    m_fProgress         = 0.0f;
 }
 
 DownloadManager::~DownloadManager()
@@ -91,8 +92,6 @@ HRESULT __stdcall DownloadManager::OnObjectAvailable(const IID & riid, IUnknown
 
 HRESULT __stdcall DownloadManager::OnProgress(ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
 {
-    UNREFERENCED_PARAMETER(ulProgress);
-    UNREFERENCED_PARAMETER(ulProgressMax);
     UNREFERENCED_PARAMETER(ulStatusCode);
     UNREFERENCED_PARAMETER(szStatusText);
 
@@ -101,6 +100,11 @@ HRESULT __stdcall DownloadManager::OnProgress(ULONG ulProgress, ULONG ulProgress
         return E_ABORT;
     }
 
+    if (ulProgressMax)
+    {
+        m_fProgress = (float)ulProgress / ulProgressMax;
+    }
+
     return S_OK;
 }
 
@@ -112,4 +116,9 @@ BOOL DownloadManager::SetInterruptEvent(HANDLE hInterrupt)
     }
 
     return DuplicateHandle(GetCurrentProcess(), hInterrupt, GetCurrentProcess(), &m_hInterruptEvent, NULL, FALSE, DUPLICATE_SAME_ACCESS);
-}
+}
+
+float DownloadManager::GetDownloadProgress()
+{
+    return m_fProgress;
+}

GH Injector Library/Download Manager.h

@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include <windows.h>
+#include "pch.h"
 
 class DownloadManager : public IBindStatusCallback
 {
-    HANDLE m_hInterruptEvent;
+    HANDLE  m_hInterruptEvent;
+    float   m_fProgress;
 
 public:
 
@@ -39,4 +40,6 @@ class DownloadManager : public IBindStatusCallback
     HRESULT __stdcall OnProgress(ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText);
 
     BOOL SetInterruptEvent(HANDLE hInterrupt);
+
+    float GetDownloadProgress();
 };

GH Injector Library/Injection Generic.cpp

@@ -181,6 +181,9 @@ DWORD __declspec(code_seg(".inj_sec$1")) __stdcall InjectionShell(INJECTION_DATA
 			LDRP_PATH_SEARCH_CONTEXT ctx{ 0 };
 			ctx.OriginalFullDllName = pData->ModuleFileName.szBuffer;
 
+			LDRP_LOAD_CONTEXT_FLAGS ctx_flags{ 0 };
+
+
 			LDR_DATA_TABLE_ENTRY * entry = nullptr;
 
 			pData->LastError = (DWORD)f->LdrpLoadDll(&pData->ModuleFileName, &ctx, { 0 }, &entry);
@@ -206,8 +209,7 @@ DWORD __declspec(code_seg(".inj_sec$1")) __stdcall InjectionShell(INJECTION_DATA
 	if (!(pData->Flags & (INJ_UNLINK_FROM_PEB | INJ_FAKE_HEADER | INJ_ERASE_HEADER)))
 	{
 		return INJ_ERR_SUCCESS;
-	}
-	
+	}	
 
 	PEB * pPEB = nullptr;
 	LDR_DATA_TABLE_ENTRY * pEntry = nullptr;