no cpp include

hopefully Sylmir approved
TeamREPENTOGON · Oct 23, 2024 · 2556811 · 2556811
1 parent e213b82
commit 2556811
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/dsound/dllmain.cpp b/dsound/dllmain.cpp
@@ -9,9 +9,10 @@
 #include "dsound/Logger.h"
 #include "updater/updater.h"
 #include "updater/updater_resources.h"
+#include <windows.h>
+#include <psapi.h> // For MODULEINFO
 
 #include <string>
-#include "../launcher_core/utils.cpp"
 
 typedef int (*ModInitFunc)(int, char **);
 
@@ -121,6 +122,32 @@ DWORD RedirectLua(HMODULE* outLua) {
 
 static HMODULE luaHandle = NULL;
 
+
+std::string GetExeVersion() {
+	HMODULE hModule = GetModuleHandle(NULL);
+	MODULEINFO modInfo;
+	if (!GetModuleInformation(GetCurrentProcess(), hModule, &modInfo, sizeof(MODULEINFO))) {
+		return "Fucked";
+	}
+	const char* baseAddress = (const char*)modInfo.lpBaseOfDll;
+	size_t moduleSize = modInfo.SizeOfImage;
+	const char* searchStr = "isaacv";
+
+	for (size_t i = 0; i < moduleSize - strlen(searchStr); ++i) {
+		const char* potentialMatch = baseAddress + i;
+		if (strncmp(potentialMatch, searchStr, strlen(searchStr)) == 0) {
+			const char* afterIsaacv = potentialMatch + strlen(searchStr);
+			const char* dashPos = strchr(afterIsaacv, '-');
+
+			if (dashPos) {
+				return std::string(afterIsaacv, dashPos);
+			}
+		}
+	}
+
+	return "Fucked";
+}
+
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
 {
 	if(ul_reason_for_call == DLL_PROCESS_ATTACH)

diff --git a/launcher_core/utils.cpp b/launcher_core/utils.cpp
@@ -1,8 +1,6 @@
 #include "dsound/utils.h"
 #include <cstdio>
 #include <cstdarg>
-#include <windows.h>
-#include <psapi.h> // For MODULEINFO
 
 #include <atomic>
 #include <string>
@@ -19,31 +17,6 @@ void InitCLI() {
     argv = CommandLineToArgvA(GetCommandLineA(), &argc);
 }
 
-std::string GetExeVersion() {
-    HMODULE hModule = GetModuleHandle(NULL);
-    MODULEINFO modInfo;
-    if (!GetModuleInformation(GetCurrentProcess(), hModule, &modInfo, sizeof(MODULEINFO))) {
-        return "Fucked";
-    }
-    const char* baseAddress = (const char*)modInfo.lpBaseOfDll;
-    size_t moduleSize = modInfo.SizeOfImage;
-    const char* searchStr = "isaacv";
-
-    for (size_t i = 0; i < moduleSize - strlen(searchStr); ++i) {
-        const char* potentialMatch = baseAddress + i;
-        if (strncmp(potentialMatch, searchStr, strlen(searchStr)) == 0) {
-            const char* afterIsaacv = potentialMatch + strlen(searchStr);
-            const char* dashPos = strchr(afterIsaacv, '-');
-
-            if (dashPos) {
-                return std::string(afterIsaacv, dashPos);
-            }
-        }
-    }
-
-    return "Fucked";
-}
-
 PCHAR* CommandLineToArgvA(PCHAR CmdLine, int* _argc)
 {
     PCHAR* argv;