Merge pull request #3 from mike1k/master

Fixed errors
mike1k · Apr 12, 2022 · 6eb89d8 · 6eb89d8
2 parents 947cc8b + a304638
commit 6eb89d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pepp/ExportDirectory.cpp b/pepp/ExportDirectory.cpp
@@ -11,19 +11,19 @@ ExportData_t ExportDirectory<bitsize>::getExport(std::uint32_t idx, bool demangl
 	if (!isPresent())
 		return {};
 
-	if (idx < GetNumberOfNames()) {
+	if (idx < getNumberOfNames()) {
 		std::uint8_t* base{};
 		std::uint32_t funcAddresses{};
 		std::uint32_t funcNames{};
 		std::uint32_t funcOrdinals{};
 		std::uint32_t funcNamesOffset{};
 		mem::ByteVector const* buffer{};
 
-		funcOrdinals = m_image->getPEHdr().rvaToOffset(GetAddressOfNameOrdinals());
+		funcOrdinals = m_image->getPEHdr().rvaToOffset(getAddressOfNameOrdinals());
 		uint16_t rlIdx = m_image->buffer().deref<uint16_t>(funcOrdinals + (idx * sizeof uint16_t));
 
-		funcAddresses = m_image->getPEHdr().rvaToOffset(GetAddressOfFunctions() + sizeof(std::uint32_t) * rlIdx);
-		funcNames = m_image->getPEHdr().rvaToOffset(GetAddressOfNames() + sizeof(std::uint32_t) * idx);
+		funcAddresses = m_image->getPEHdr().rvaToOffset(getAddressOfFunctions() + sizeof(std::uint32_t) * rlIdx);
+		funcNames = m_image->getPEHdr().rvaToOffset(getAddressOfNames() + sizeof(std::uint32_t) * idx);
 		funcNamesOffset = m_image->getPEHdr().rvaToOffset(m_image->buffer().deref<uint32_t>(funcNames));
 
 
@@ -45,9 +45,9 @@ ExportData_t ExportDirectory<bitsize>::getExport(std::uint32_t idx, bool demangl
 template<unsigned int bitsize>
 ExportData_t pepp::ExportDirectory<bitsize>::getExport(std::string_view name, bool demangle) const
 {
-	for (int i = 0; i < GetNumberOfNames(); i++)
+	for (int i = 0; i < getNumberOfNames(); i++)
 	{
-		ExportData_t data = GetExport(i, demangle);
+		ExportData_t data = getExport(i, demangle);
 		if (data.name == name)
 			return data;
 	}
@@ -58,9 +58,9 @@ ExportData_t pepp::ExportDirectory<bitsize>::getExport(std::string_view name, bo
 template<unsigned int bitsize>
 void ExportDirectory<bitsize>::traverseExports(const std::function<void(ExportData_t*)>& cb_func, bool demangle)
 {
-	for (int i = 0; i < GetNumberOfNames(); i++)
+	for (int i = 0; i < getNumberOfNames(); i++)
 	{
-		ExportData_t data = GetExport(i, demangle);
+		ExportData_t data = getExport(i, demangle);
 		if (data.rva != 0)
 			cb_func(&data);
 	}

diff --git a/pepp/ImportDirectory.cpp b/pepp/ImportDirectory.cpp
@@ -54,7 +54,7 @@ bool ImportDirectory<bitsize>::hasModuleImport(std::string_view module, std::str
 			{
 				//
 				// TODO: Ordinals not handled here.
-				if (IsImportOrdinal(firstThunk->u1.Ordinal))
+				if (isImportOrdinal(firstThunk->u1.Ordinal))
 				{
 					index++;
 					firstThunk++;
@@ -458,7 +458,7 @@ void ImportDirectory<bitsize>::traverseImports(const std::function<void(ModuleIm
 			IMAGE_IMPORT_BY_NAME* _imp =
 				buffer->as<decltype(_imp)>(m_image->getPEHdr().rvaToOffset(firstThunk->u1.AddressOfData));
 
-			if (IsImportOrdinal(firstThunk->u1.Ordinal))
+			if (isImportOrdinal(firstThunk->u1.Ordinal))
 			{
 				data.ordinal = true;
 				data.import_variant = (std::uint64_t)firstThunk->u1.Ordinal;