Merge branch 'Unc3nZureD-master'

Author: DarthTon

src/BlackBone/ManualMap/MMap.cpp

@@ -92,9 +92,12 @@ call_result_t<ModuleDataPtr> MMap::MapImageInternal(
     CustomArgs_t* pCustomArgs /*= nullptr*/
     )
 {
-    // Already loaded
-    if (auto hMod = _process.modules().GetModule( path ))
-        return hMod;
+    if (!(flags & ForceRemap))
+    {
+        // Already loaded
+        if (auto hMod = _process.modules().GetModule(path))
+            return hMod;
+    }
 
     // Prepare target process
     auto mode = (flags & NoThreads) ? Worker_UseExisting : Worker_CreateNew;
@@ -293,11 +296,14 @@ call_result_t<ModuleDataPtr> MMap::FindOrMapModule(
         return status;
     }
 
-    // Check if already loaded
-    if (auto hMod = _process.modules().GetModule( path, LdrList, pImage->peImage.mType() ))
+    // Check if already loaded, but only if doesn't explicitly excluded
+    if (!(flags & ForceRemap))
     {
-        pImage->peImage.Release();
-        return hMod;
+        if (auto hMod = _process.modules().GetModule( path, LdrList, pImage->peImage.mType() ))
+        {
+            pImage->peImage.Release();
+            return hMod;
+        }
     }
 
     // Check architecture
@@ -402,8 +408,14 @@ call_result_t<ModuleDataPtr> MMap::FindOrMapModule(
     }
 
     auto mt = ldrEntry.type;
-    auto pMod = _process.modules().AddManualModule( static_cast<ModuleData&>(ldrEntry) );
-    {
+	ModuleDataPtr pMod;
+
+    if (flags & ForceRemap)
+        pMod = std::make_shared<const ModuleData>( _process.modules().Canonicalize( ldrEntry, true ) );
+    else
+        pMod = _process.modules().AddManualModule( ldrEntry );
+
+	{
         // Handle x64 system32 dlls for wow64 process
         bool fsRedirect = !(flags & IsDependency) && mt == mt_mod64 && _process.barrier().sourceWow64;
 

src/BlackBone/ManualMap/MMap.h

@@ -100,6 +100,7 @@ enum eLoadFlags
     MapInHighMem    = 0x20,     // Try to map image in address space beyond 4GB limit
     RebaseProcess   = 0x40,     // If target image is an .exe file, process base address will be replaced with mapped module value
     NoThreads       = 0x80,     // Don't create new threads, use hijacking
+    ForceRemap		= 0x100,	// Force remapping module even if it's already loaded
 
     NoExceptions    = 0x01000,   // Do not create custom exception handler
     PartialExcept   = 0x02000,   // Only create Inverted function table, without VEH

src/BlackBone/Process/ProcessModules.cpp

@@ -581,14 +581,32 @@ bool ProcessModules::ValidateModule( module_t base )
 /// </summary>
 /// <param name="mod">Module data</param>
 /// <returns>Module info</returns>
-ModuleDataPtr ProcessModules::AddManualModule( ModuleData mod )
+ModuleDataPtr ProcessModules::AddManualModule( const ModuleData& mod )
 {
-    mod.fullPath = Utils::ToLower( std::move( mod.fullPath ) );
-    mod.name = Utils::ToLower( std::move( mod.name ) );
-    mod.manual = true;
+    auto canonicalized = Canonicalize( mod, true );
+    auto key = std::make_pair( canonicalized.name, canonicalized.type );
+    return _modules.emplace( key, std::make_shared<const ModuleData>( canonicalized ) ).first->second;
+}
+
+/// <summary>
+/// Canonicalize paths and set module type to manual if requested
+/// </summary>
+/// <param name="mod">Module data</param>
+/// <param name="manual">Value to set ModuleData::manual to</param>
+/// <returns>Module data</returns>
+ModuleData ProcessModules::Canonicalize( const ModuleData& mod, bool manual )
+{
+    ModuleData result = {};
+
+    result.baseAddress = mod.baseAddress;
+    result.ldrPtr = mod.ldrPtr;
+    result.size = mod.size;
+    result.type = mod.type;
+    result.fullPath = Utils::ToLower( mod.fullPath );
+    result.name = Utils::ToLower( mod.name );
+    result.manual = manual;
 
-    auto key = std::make_pair( mod.name, mod.type );
-    return _modules.emplace( key, std::make_shared<const ModuleData>( mod ) ).first->second;
+    return result;
 }
 
 /// <summary>

src/BlackBone/Process/ProcessModules.h

@@ -206,7 +206,15 @@ class ProcessModules
     /// </summary>
     /// <param name="mod">Module data</param>
     /// <returns>Module info</returns>
-    BLACKBONE_API ModuleDataPtr AddManualModule( ModuleData mod );
+    BLACKBONE_API ModuleDataPtr AddManualModule( const ModuleData& mod );
+
+    /// <summary>
+    /// Canonicalize paths and set module type to manual if requested
+    /// </summary>
+    /// <param name="mod">Module data</param>
+    /// <param name="manual">Value to set ModuleData::manual to</param>
+    /// <returns>Module data</returns>
+    BLACKBONE_API ModuleData Canonicalize( const ModuleData& mod, bool manual );
 
     /// <summary>
     /// Remove module from module list