From 1f2077485e580b3b1d582298281ac6272df18d8d Mon Sep 17 00:00:00 2001
From: jbzdarkid <jbzdarkid@gmail.com>
Date: Sat, 27 Oct 2018 01:27:29 -0700
Subject: /W3 clean, add .msi installer project

---
 WitnessRandomizer/Memory.h | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'WitnessRandomizer/Memory.h')

diff --git a/WitnessRandomizer/Memory.h b/WitnessRandomizer/Memory.h
index 6f5b8b7..8e8bbc3 100644
--- a/WitnessRandomizer/Memory.h
+++ b/WitnessRandomizer/Memory.h
@@ -2,9 +2,6 @@
 #include <vector>
 #include <map>
 #include <windows.h>
-#include <thread>
-#include <chrono>
-using namespace std::chrono_literals;
 
 // https://github.com/erayarslan/WriteProcessMemory-Example
 // http://stackoverflow.com/q/32798185
@@ -16,16 +13,18 @@ public:
 	Memory(const std::string& processName);
 	~Memory();
 
+	Memory(const Memory& memory) = delete;
+	Memory& operator=(const Memory& other) = delete;
+
 	template<class T>
-	std::vector<T> ReadData(const std::vector<int>& offsets, int numItems) {
+	std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) {
 		std::vector<T> data;
 		data.resize(numItems);
 		for (int i=0; i<5; i++) {
-			if (ReadProcessMemory(_handle, (LPVOID)ComputeOffset(offsets), &data[0], sizeof(T) * numItems, NULL))
+			if (ReadProcessMemory(_handle, ComputeOffset(offsets), &data[0], sizeof(T) * numItems, nullptr))
 			{
 				return data;
 			}
-			// std::this_thread::sleep_for(10ms);
 		}
 		ThrowError();
 		return {};
@@ -34,10 +33,9 @@ public:
 	template <class T>
 	void WriteData(const std::vector<int>& offsets, const std::vector<T>& data) {
 		for (int i=0; i<5; i++) {
-			if (WriteProcessMemory(_handle, (LPVOID)ComputeOffset(offsets), &data[0], sizeof(T) * data.size(), NULL)) {
+			if (WriteProcessMemory(_handle, ComputeOffset(offsets), &data[0], sizeof(T) * data.size(), nullptr)) {
 				return;
 			}
-			// std::this_thread::sleep_for(10ms);
 		}
 		ThrowError();
 	}
@@ -45,9 +43,9 @@ public:
 private:
 	void ThrowError();
 
-	uintptr_t ComputeOffset(std::vector<int> offsets);
+	void* ComputeOffset(std::vector<int> offsets);
 
 	std::map<uintptr_t, uintptr_t> _computedAddresses;
-	uintptr_t _baseAddress;
-	HANDLE _handle;
+	uintptr_t _baseAddress = 0;
+	HANDLE _handle = nullptr;
 };
\ No newline at end of file
-- 
cgit 1.4.1