Update Section_t structure

Author: Wend4r

include/dynlibutils/module.hpp

@@ -39,18 +39,14 @@
 
 namespace DynLibUtils {
 
-struct Section_t
+struct Section_t : public CMemory // Start address of the section.
 {
 	// Constructors.
-	Section_t(size_t nSectionSize = 0, const std::string_view& svSectionName = {}, CMemory pSectionBase = nullptr) noexcept : m_nSectionSize(nSectionSize), m_svSectionName(svSectionName), m_pBase(pSectionBase) {} // Default one.
-	Section_t(Section_t&& other) noexcept : m_nSectionSize(std::move(other.m_nSectionSize)), m_svSectionName(std::move(other.m_svSectionName)), m_pBase(std::move(other.m_pBase)) {}
-
-	[[nodiscard]]
-	bool IsValid() const noexcept { return m_pBase.IsValid(); }
+	Section_t(CMemory pSectionBase = nullptr, size_t nSectionSize = 0, const std::string_view& svSectionName = {}) noexcept : CMemory(pSectionBase), m_nSectionSize(nSectionSize), m_svSectionName(svSectionName) {} // Default one.
+	Section_t(Section_t&& other) noexcept = default;
 
 	std::size_t m_nSectionSize;     // Size of the section.
 	std::string m_svSectionName;    // Name of the section.
-	CMemory m_pBase;                // Start address of the section.
 }; // struct Section_t
 
 static constexpr std::size_t s_nDefaultPatternSize = 128;
@@ -332,7 +328,7 @@ class CModule : public CMemory
 		if (!pSection || !pSection->IsValid())
 			return DYNLIB_INVALID_MEMORY;
 
-		const std::uintptr_t base = pSection->m_pBase;
+		const std::uintptr_t base = pSection->GetAddr();
 		const std::size_t sectionSize = pSection->m_nSectionSize;
 		const std::size_t patternSize = svMask.size();
 
@@ -429,7 +425,7 @@ class CModule : public CMemory
 		if (!pSection || !pSection->IsValid())
 			return 0;
 
-		const CMemory pBase = pSection->m_pBase;
+		const CMemory pBase = *pSection;
 		const std::size_t sectionSize = pSection->m_nSectionSize;
 
 		CMemory pIter = pStartAddress ? pStartAddress : pBase;

src/apple/module.cpp

@@ -136,9 +136,9 @@ bool CModule::LoadFromPath(const std::string_view svModelePath, int flags)
 			for (uint32_t j = 0; j < seg->nsects; ++j) {
 				const MachSection& section = sec[j];
 				m_vecSections.emplace_back(
+					GetAddr() + section.addr,
 					section.size,
-					section.sectname,
-					GetAddr() + section.addr
+					section.sectname
 				);
 			}
 		}

src/linux/module.cpp

@@ -123,16 +123,16 @@ bool CModule::LoadFromPath(const std::string_view svModelePath, int flags)
 		if (map != MAP_FAILED)
 		{
 			ElfW(Ehdr)* ehdr = static_cast<ElfW(Ehdr)*>(map);
-			ElfW(Shdr)* shdrs = reinterpret_cast<ElfW(Shdr)*>(reinterpret_cast<uintptr_t>(ehdr) + ehdr->e_shoff);
-			const char* strTab = reinterpret_cast<const char*>(reinterpret_cast<uintptr_t>(ehdr) + shdrs[ehdr->e_shstrndx].sh_offset);
+			ElfW(Shdr)* shdrs = reinterpret_cast<ElfW(Shdr)*>(reinterpret_cast<std::uintptr_t>(ehdr) + ehdr->e_shoff);
+			const char* strTab = reinterpret_cast<const char*>(reinterpret_cast<std::uintptr_t>(ehdr) + shdrs[ehdr->e_shstrndx].sh_offset);
 
 			for (auto i = 0; i < ehdr->e_shnum; ++i) // Loop through the sections.
 			{
-				ElfW(Shdr)* shdr = reinterpret_cast<ElfW(Shdr)*>(reinterpret_cast<uintptr_t>(shdrs) + i * ehdr->e_shentsize);
+				ElfW(Shdr)* shdr = reinterpret_cast<ElfW(Shdr)*>(reinterpret_cast<std::uintptr_t>(shdrs) + i * ehdr->e_shentsize);
 				if (*(strTab + shdr->sh_name) == '\0')
 					continue;
 
-				m_vecSections.emplace_back(shdr->sh_size, strTab + shdr->sh_name, static_cast<uintptr_t>(lmap->l_addr + shdr->sh_addr));
+				m_vecSections.emplace_back(static_cast<std::uintptr_t>(lmap->l_addr + shdr->sh_addr), shdr->sh_size, strTab + shdr->sh_name);
 			}
 
 			munmap(map, st.st_size);

src/windows/module.cpp

@@ -116,14 +116,14 @@ bool CModule::LoadFromPath(const std::string_view svModelePath, int flags)
 	}
 
 	IMAGE_DOS_HEADER* pDOSHeader = reinterpret_cast<IMAGE_DOS_HEADER*>(handle);
-	IMAGE_NT_HEADERS64* pNTHeaders = reinterpret_cast<IMAGE_NT_HEADERS64*>(reinterpret_cast<uintptr_t>(handle) + pDOSHeader->e_lfanew);
+	IMAGE_NT_HEADERS64* pNTHeaders = reinterpret_cast<IMAGE_NT_HEADERS64*>(reinterpret_cast<std::uintptr_t>(handle) + pDOSHeader->e_lfanew);
 
 	const IMAGE_SECTION_HEADER* hSection = IMAGE_FIRST_SECTION(pNTHeaders); // Get first image section.
 
 	for (WORD i = 0; i < pNTHeaders->FileHeader.NumberOfSections; ++i) // Loop through the sections.
 	{
 		const IMAGE_SECTION_HEADER& hCurrentSection = hSection[i]; // Get current section.
-		m_vecSections.emplace_back(hCurrentSection.SizeOfRawData, reinterpret_cast<const char*>(hCurrentSection.Name), static_cast<uintptr_t>(reinterpret_cast<uintptr_t>(handle) + hCurrentSection.VirtualAddress)); // Push back a struct with the section data.
+		m_vecSections.emplace_back(static_cast<std::uintptr_t>(reinterpret_cast<std::uintptr_t>(handle) + hCurrentSection.VirtualAddress), hCurrentSection.SizeOfRawData, reinterpret_cast<const char*>(hCurrentSection.Name)); // Push back a struct with the section data.
 	}
 
 	SetPtr(static_cast<void *>(handle));
@@ -158,7 +158,7 @@ CMemory CModule::GetVirtualTableByName(const std::string_view svTableName, bool
 		return DYNLIB_INVALID_MEMORY;
 
 	CMemory rttiTypeDescriptor = typeDescriptorName.Offset(-0x10);
-	uintptr_t rttiTDRva = rttiTypeDescriptor.GetAddr() - GetBase().GetAddr(); // The RTTI gets referenced by a 4-Byte RVA address. We need to scan for that address.
+	std::uintptr_t rttiTDRva = rttiTypeDescriptor.GetAddr() - GetBase().GetAddr(); // The RTTI gets referenced by a 4-Byte RVA address. We need to scan for that address.
 
 	CMemory reference;
 	while ((reference = FindPattern(&rttiTDRva, "xxxx", reference, pReadOnlyData))) // Get reference typeinfo in vtable