constexpr where appropriate

SteamTarget/SteamTarget.cpp

@@ -134,9 +134,9 @@ void SteamTarget::read_ini()
 void SteamTarget::initOverlayEvents()
 {
 		//You hook into **MY** process? I'm ready to play your games, Valve! I'll hook back!!! 😅
-		const DWORD addressOpen = hook_commons::FindPattern(overlay_module_name_.data(),
-			overlay_open_func_sig_,
-			overlay_open_func_mask_.data());
+		const DWORD addressOpen = hook_commons::FindPattern(overlay_module_name,
+			overlay_open_func_sig,
+			overlay_open_func_mask);
 
 		if (addressOpen != 0)
 		{
@@ -145,10 +145,10 @@ void SteamTarget::initOverlayEvents()
 			for (DWORD i = 0; i < 1024; i++)	//search next signature relativ to "addressOpened"
 			{
 				bool found = true;
-				for (DWORD j = 0; j < overlay_closed_func_mask_.length(); j++)
+				for (DWORD j = 0; j < std::string(overlay_closed_func_mask).length(); j++)
 					found &=
-						overlay_closed_func_mask_[j] == '?' || 
-					overlay_closed_func_sig_[j] == *reinterpret_cast<char*>(addressOpen + j + i);
+						overlay_closed_func_mask[j] == '?' || 
+					overlay_closed_func_sig[j] == *reinterpret_cast<char*>(addressOpen + j + i);
 
 				if (found)
 				{
@@ -159,15 +159,15 @@ void SteamTarget::initOverlayEvents()
 
 			if (addressClosed != 0)
 			{
-				overlay_hook::JMPBackOpen = addressOpen + overlay_open_func_mask_.length();
-				overlay_hook::JMPBackClosed = addressClosed + overlay_closed_func_mask_.length();
+				overlay_hook::JMPBackOpen = addressOpen + std::string(overlay_open_func_mask).length();
+				overlay_hook::JMPBackClosed = addressClosed + std::string(overlay_closed_func_mask).length();
 				overlay_hook::target_overlay = &target_overlay_;
 
 				hook_commons::PlaceJMP(reinterpret_cast<BYTE*>(addressOpen),
-					reinterpret_cast<DWORD>(overlay_hook::overlay_opend_hookFN), overlay_open_func_mask_.length());
+					reinterpret_cast<DWORD>(overlay_hook::overlay_opend_hookFN), std::string(overlay_open_func_mask).length());
 
 				hook_commons::PlaceJMP(reinterpret_cast<BYTE*>(addressClosed),
-					reinterpret_cast<DWORD>(overlay_hook::overlay_closed_hookFN), overlay_closed_func_mask_.length());
+					reinterpret_cast<DWORD>(overlay_hook::overlay_closed_hookFN), std::string(overlay_closed_func_mask).length());
 			}
 		}
 }

SteamTarget/SteamTarget.h

@@ -86,21 +86,17 @@ private:
 
 	//Hooking stuff...
 #ifdef _AMD64_
-	const std::string overlay_module_name_ = "GameOverlayRenderer64.dll";
-	const std::string overlay_open_func_sig_ = "TODO";
-	const std::string overlay_open_func_mask_= "TODO";
+	constexpr static const char* overlay_module_name = "GameOverlayRenderer64.dll";
+	constexpr static const char* overlay_open_func_sig = "TODO";
+	constexpr static const char* overlay_open_func_mask= "TODO";
 #else
-	const std::string overlay_module_name_ = "GameOverlayRenderer.dll";
+	constexpr static const char* overlay_module_name = "GameOverlayRenderer.dll";
 
-	const char* overlay_open_func_sig_
-		= "\x56\xC6\x46\x28\x01";
-	const std::string overlay_open_func_mask_
-		= "xxxxx";
+	constexpr static const char* overlay_open_func_sig = "\x56\xC6\x46\x28\x01";
+	constexpr static const char* overlay_open_func_mask = "xxxxx";
 
-	const char* overlay_closed_func_sig_
-		= "\xC7\x46\x24\x00\x00\x00\x00\xC6\x46\x28\x00";
-	const std::string overlay_closed_func_mask_
-		= "xxxxxxxxxxx";
+	constexpr static const char* overlay_closed_func_sig = "\xC7\x46\x24\x00\x00\x00\x00\xC6\x46\x28\x00";
+	constexpr static const char* overlay_closed_func_mask = "xxxxxxxxxxx";
 
 #endif
 

SteamTarget/VirtualControllerThread.cpp

@@ -164,9 +164,9 @@ void VirtualControllerThread::controllerLoop()
 		}
 
 		tick_time_ = sf_clock_.getElapsedTime().asMicroseconds();
-		if (tick_time_ < delay_)
+		if (tick_time_ < delay)
 		{
-			std::this_thread::sleep_for(std::chrono::microseconds(delay_ - tick_time_));
+			std::this_thread::sleep_for(std::chrono::microseconds(delay - tick_time_));
 		}
 
 	}
@@ -195,7 +195,7 @@ DWORD VirtualControllerThread::callRealXinputGetState(DWORD dwUserIndex, XINPUT_
 	VirtualProtect(Address, op_patch_lenght, PAGE_EXECUTE_READWRITE, &dwOldProtect);		//Change permissions of memory..
 	for (DWORD i = 0; i < op_patch_lenght; i++)											//unpatch Valve's hook
 	{
-		*(Address + i) = real_bytes_[i];
+		*(Address + i) = real_bytes[i];
 	}
 
 	const DWORD ret = x_get_state_(dwUserIndex, pState);												//Cal REAL XInputGetState...

SteamTarget/VirtualControllerThread.h

@@ -56,9 +56,9 @@ private:
 	bool seven_ = false;
 
 #ifdef _AMD64_
-	const uint8_t realBytes[5] = {0x48, 0x89, 0x5C, 0x24, 0x08};
+	static constexpr const uint8_t realBytes[5] = {0x48, 0x89, 0x5C, 0x24, 0x08};
 #else
-	const uint8_t real_bytes_[5] = { 0x8B, 0xFF, 0x55, 0x8B, 0xEC };
+	static constexpr const uint8_t real_bytes[5] = { 0x8B, 0xFF, 0x55, 0x8B, 0xEC };
 #endif
 	//uint8_t realBytes[5] = { 0xDE, 0xAD, 0xBE, 0xEF, 0x90 };
 
@@ -72,7 +72,7 @@ private:
 
 	sf::Clock sf_clock_;
 	int tick_time_ = 0;
-	int delay_ = 1000000 / 200;
+	constexpr static int delay = 1000000 / 200;
 
 	void controllerLoop();