From c1cfed62160048c36ade9984d63a2bdfcdf751b2 Mon Sep 17 00:00:00 2001
From: mkrsym1 <mkrsym1@gmail.com>
Date: Tue, 6 Jun 2023 20:23:15 +0300
Subject: [PATCH] Move envvar names into injshared.h

---
 injector/include/injshared.h        | 3 +++
 injector/launcher_payload/src/dll.c | 7 ++-----
 injector/src/injector.c             | 7 ++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/injector/include/injshared.h b/injector/include/injshared.h
index b09eace..4c5f896 100644
--- a/injector/include/injshared.h
+++ b/injector/include/injshared.h
@@ -1,5 +1,8 @@
 #include <windows.h>
 
+const char ENV_EXE_PATH[] = "JADEITE_TARGET_EXE_PATH";
+const char ENV_DLL_PATH[] = "JADEITE_INJECT_DLL_PATH";
+
 static inline void write_protected_process_memory(HANDLE process, void *address, const void *buf, size_t size) {
     DWORD oldProtect;
     VirtualProtectEx(process, address, size, PAGE_EXECUTE_READWRITE, &oldProtect);
diff --git a/injector/launcher_payload/src/dll.c b/injector/launcher_payload/src/dll.c
index 8ba1403..65a8a88 100644
--- a/injector/launcher_payload/src/dll.c
+++ b/injector/launcher_payload/src/dll.c
@@ -2,9 +2,6 @@
 
 #include <lpayload.h>
 
-const char EXE_ENV[] = "JADEITE_TARGET_EXE_PATH";
-const char INJECT_DLL_ENV[] = "JADEITE_INJECT_DLL_PATH";
-
 static inline void read_env(const char *env, char *dest, size_t size) {
     GetEnvironmentVariableA(env, dest, size);
     SetEnvironmentVariableA(env, "");
@@ -18,11 +15,11 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
 
     // Get target EXE path
     char targetExe[MAX_PATH];
-    read_env(EXE_ENV, targetExe, sizeof(targetExe));
+    read_env(ENV_EXE_PATH, targetExe, sizeof(targetExe));
     
     // Get the path of the DLL to inject
     char injectDll[MAX_PATH];
-    read_env(INJECT_DLL_ENV, injectDll, sizeof(injectDll));
+    read_env(ENV_DLL_PATH, injectDll, sizeof(injectDll));
 
     // Compute the working directory path
     char workdir[MAX_PATH];
diff --git a/injector/src/injector.c b/injector/src/injector.c
index 820fa50..4dfdd1b 100644
--- a/injector/src/injector.c
+++ b/injector/src/injector.c
@@ -4,9 +4,6 @@
 
 #include <ipayload.h>
 
-const char EXE_ENV[] = "JADEITE_TARGET_EXE_PATH";
-const char INJECT_DLL_ENV[] = "JADEITE_INJECT_DLL_PATH";
-
 const char LAUNCHER_INJECT_DLL[] = "launcher_payload.dll";
 const char GAME_INJECT_DLL[] = "game_payload.dll";
 
@@ -46,8 +43,8 @@ int main(int argc, char **argv) {
     printf("Starting \"%s\" via \"%s\"\n", gameExePath, launcherPath);
 
     // Set envvars
-    SetEnvironmentVariableA(EXE_ENV, gameExePath);
-    SetEnvironmentVariableA(INJECT_DLL_ENV, gamePayloadPath);
+    SetEnvironmentVariableA(ENV_EXE_PATH, gameExePath);
+    SetEnvironmentVariableA(ENV_DLL_PATH, gamePayloadPath);
 
     // Start the launcher
     STARTUPINFO si;