Made changes

Author: 3ts75

ResourceHack/CreateType.h

@@ -15,8 +15,6 @@ class OriginalHandle {
 	}
 };
 
-// mi2
-// TODO: メモリ上にファイルがないとdos_header->e_lfanewがないので改善の余地あり
 class IMAGE_PE_HEADER {
 	PIMAGE_DOS_HEADER dos_header;
 	PIMAGE_NT_HEADERS64 nt_headers;

ResourceHack/FileOperations.cpp

@@ -1,7 +1,7 @@
 #include "FileOperations.h"
 #include "CreateType.h"
 
-DWORD FileRead(std::string& strFilePath, LPVOID& lpBuffer) {
+DWORD DiskToMemory(std::string& strFilePath, LPVOID& lpBuffer) {
 	DWORD ret{ 0 };
 
 	do {
@@ -18,8 +18,7 @@ DWORD FileRead(std::string& strFilePath, LPVOID& lpBuffer) {
 			break;
 		}
 
-		//lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpFileSize->QuadPart);
-		lpBuffer = VirtualAlloc(nullptr, lpFileSize->QuadPart, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+		lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpFileSize->QuadPart);
 		if (lpBuffer == NULL) {
 			break;
 		}
@@ -37,7 +36,7 @@ DWORD FileRead(std::string& strFilePath, LPVOID& lpBuffer) {
 
 
 template<class T>
-bool FileWrite(const char* strFilePath, T lpBuffer, DWORD& dwFileSize) {
+bool MemoryToDisk(const char* strFilePath, T lpBuffer, DWORD& dwFileSize) {
 	bool ret{ false };
 
 	do {
@@ -57,5 +56,5 @@ bool FileWrite(const char* strFilePath, T lpBuffer, DWORD& dwFileSize) {
 	return false;
 }
 
-template bool FileWrite<char*>(const char* strFilePath, char* lpBuffer, DWORD& dwFileSize);
-template bool FileWrite<LPVOID>(const char* strFilePath, LPVOID lpBuffer, DWORD& dwFileSize);
+template bool MemoryToDisk<char*>(const char* strFilePath, char* lpBuffer, DWORD& dwFileSize);
+template bool MemoryToDisk<LPVOID>(const char* strFilePath, LPVOID lpBuffer, DWORD& dwFileSize);

ResourceHack/FileOperations.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-DWORD FileRead(std::string& strFilePath, LPVOID& lpBuffer);
+DWORD DiskToMemory(std::string& strFilePath, LPVOID& lpBuffer);
 
 template<class T>
-bool FileWrite(const char* strFilePath, T lpBuffer, DWORD& dwFileSize);
+bool MemoryToDisk(const char* strFilePath, T lpBuffer, DWORD& dwFileSize);

ResourceHack/ResourceHack.cpp

@@ -66,7 +66,7 @@ LPVOID ResourceHack(LPVOID& buffer, DWORD& size, string& after_path, string& bef
 		}
 		write_size += (resource_size / 0x10 + 2) * 0x10;
 
-		after_size = FileRead(after_path, after_buffer);
+		after_size = DiskToMemory(after_path, after_buffer);
 		write_size += after_size;
 		write_size = (write_size / pe_header->get_nt()->OptionalHeader.FileAlignment + 1) * pe_header->get_nt()->OptionalHeader.FileAlignment;
 
@@ -85,7 +85,7 @@ LPVOID ResourceHack(LPVOID& buffer, DWORD& size, string& after_path, string& bef
 		PIMAGE_RESOURCE_DIRECTORY hacked_dir{ (PIMAGE_RESOURCE_DIRECTORY)((ULONGLONG)write_buffer + size) };
 		LPVOID before_buffer{ nullptr };
 		DWORD before_size{ 0 };
-		before_size = FileRead(before_path, before_buffer);
+		before_size = DiskToMemory(before_path, before_buffer);
 		after_buffer = (LPVOID)((ULONGLONG)write_buffer + size + (resource_size / 0x10 + 2) * 0x10);
 		ResourceResetting(hacked_dir, resource_section->VirtualAddress, hacked_section->VirtualAddress, hacked_dir, after_buffer, after_size, before_buffer, before_size);
 	}
@@ -106,11 +106,11 @@ int main() {
 	DWORD size{ 0 };
 	LPVOID write_buffer{ nullptr };
 
-	size = FileRead(path, read_buffer);
+	size = DiskToMemory(path, read_buffer);
 
 	path += ".exe";
 
 	write_buffer = ResourceHack(read_buffer, size, after_path, before_path);
 
-	FileWrite(path.c_str(), write_buffer, size);
+	MemoryToDisk(path.c_str(), write_buffer, size);
 }