aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2021-09-04 03:21:20 +0100
committerBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2021-09-04 03:21:20 +0100
commit07dfc69252f520bb5ed8ce92e55da4a8cf985bff (patch)
treee09753364c3271b44591486d55253aa91a09544e
parent9f0288d744cd8dbd9b4213bd7a1a73a0c822b5a6 (diff)
downloadNorthstarLauncher-07dfc69252f520bb5ed8ce92e55da4a8cf985bff.tar.gz
NorthstarLauncher-07dfc69252f520bb5ed8ce92e55da4a8cf985bff.zip
random commit before reworking a large part of launcher code
-rw-r--r--GameInjector/dllmain.cpp40
-rw-r--r--NorthstarDedicatedTest/keyvalues.cpp7
2 files changed, 33 insertions, 14 deletions
diff --git a/GameInjector/dllmain.cpp b/GameInjector/dllmain.cpp
index 2ab0415c..a6c4e8b7 100644
--- a/GameInjector/dllmain.cpp
+++ b/GameInjector/dllmain.cpp
@@ -7,6 +7,7 @@
#include <filesystem>
#include <iostream>
#include <iomanip>
+#include <thread>
#define DLL_NAME L"Northstar.dll"
@@ -84,6 +85,7 @@ BOOL WINAPI CreateProcessWHook(
std::cout << "Creating titanfall process!" << std::endl;
std::cout << "Handle: " << lpProcessInformation->hProcess << " ID: " << lpProcessInformation->dwProcessId << " Thread: " << lpProcessInformation->hThread << std::endl;
+ //while (!IsDebuggerPresent()) Sleep(100);
STARTUPINFO si;
memset(&si, 0, sizeof(si));
PROCESS_INFORMATION pi;
@@ -91,7 +93,7 @@ BOOL WINAPI CreateProcessWHook(
// check if we're launching EASteamProxy for steam users, or just launching tf2 directly for origin users
// note: atm we fully disable steam integration in origin when we inject, return to this later
- if (!wcsstr(lpApplicationName, L"Origin\\EASteamProxy.exe"))
+ if (!wcsstr(lpCommandLine, L"Origin\\EASteamProxy.exe"))
{
std::stringstream argStr;
argStr << lpProcessInformation->dwProcessId;
@@ -112,6 +114,7 @@ BOOL WINAPI CreateProcessWHook(
ResumeThread(lpProcessInformation->hThread);
// cleanup
+ // note: i phyisically cannot get cleanup to work rn, not sure why
MH_DisableHook(&CreateProcessW);
MH_RemoveHook(&CreateProcessW);
MH_Uninitialize();
@@ -131,7 +134,6 @@ BOOL WINAPI CreateProcessWHook(
FreeLibrary(ownHModule);
}
-
return ret;
}
@@ -140,19 +142,17 @@ BOOL APIENTRY DllMain(HMODULE hModule,
LPVOID lpReserved
)
{
+
switch (ul_reason_for_call)
{
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:
- DisableThreadLibraryCalls(hModule);
+ // DisableThreadLibraryCalls(hModule); // wanted this, but unfortunately tf2 hates me
case DLL_THREAD_DETACH:
case DLL_PROCESS_DETACH:
break;
}
- //AllocConsole();
- //freopen("CONOUT$", "w", stdout);
-
ownHModule = hModule;
char ownDllPath[MAX_PATH];
GetModuleFileNameA(hModule, ownDllPath, MAX_PATH);
@@ -160,22 +160,34 @@ BOOL APIENTRY DllMain(HMODULE hModule,
tf2DirPath = std::filesystem::path(ownDllPath).parent_path();
// hook CreateProcessW
- if (MH_Initialize() > MH_ERROR_ALREADY_INITIALIZED) // MH_ERROR_ALREADY_INITIALIZED = 1, MH_OK = 0, these are the only results we should expect
+ if (MH_Initialize() != MH_OK)
return TRUE;
MH_CreateHook(&CreateProcessW, &CreateProcessWHook, reinterpret_cast<LPVOID*>(&CreateProcessWOriginal));
MH_EnableHook(&CreateProcessW);
+ char ownProcessPath[MAX_PATH];
+ GetModuleFileNameA(NULL, ownProcessPath, MAX_PATH);
// TEMP: temporarily disable steam stuff because it's a huge pain
// change conditional jump to EASteamProxy stuff in launchStep2 to never hit EASteamProxy launch
- void* ptr = (char*)GetModuleHandleA("OriginClient.dll") + 0x2A83FA;
- TempReadWrite rw(ptr);
- *((char*)ptr) = 0xE9; // je => jmp
- *((char*)ptr + 1) = 0xE6;
- *((char*)ptr + 2) = 0x01;
- *((char*)ptr + 3) = 0x00;
- *((char*)ptr + 4) = 0x00;
+ if (!strcmp(ownProcessPath, "Origin.exe"))
+ {
+ void* ptr = (char*)LoadLibraryA("OriginClient.dll") + 0x2A83FA;
+ TempReadWrite rw(ptr);
+
+ *((char*)ptr) = 0xE9; // je => jmp
+ *((char*)ptr + 1) = 0xE6;
+ *((char*)ptr + 2) = 0x01;
+ *((char*)ptr + 3) = 0x00;
+ *((char*)ptr + 4) = 0x00;
+ }
+ else if (!strcmp(ownProcessPath, "EADesktop.exe"))
+ {
+ // idk not doing this rn
+ MessageBoxA(NULL, "EADesktop not currently supported", "", MB_OK);
+ }
+
return TRUE;
}
diff --git a/NorthstarDedicatedTest/keyvalues.cpp b/NorthstarDedicatedTest/keyvalues.cpp
index 6ddb9d99..3d527e62 100644
--- a/NorthstarDedicatedTest/keyvalues.cpp
+++ b/NorthstarDedicatedTest/keyvalues.cpp
@@ -82,6 +82,13 @@ void ModManager::TryBuildKeyValues(const char* filename)
// load original file, so we can parse out the name of the root obj (e.g. WeaponData for weapons)
std::string originalFile = ReadVPKOriginalFile(filename);
+
+ if (!originalFile.length())
+ {
+ spdlog::warn("Tried to patch kv {} but no base kv was found!", ogFilePath);
+ return;
+ }
+
char rootName[64];
memset(rootName, 0, sizeof(rootName));