From 02bd700547f20dea4b2334b3a445d7a09913fb6a Mon Sep 17 00:00:00 2001 From: ChrisMiuchiz Date: Wed, 16 Oct 2019 19:35:25 -0400 Subject: [PATCH] fix double load bug, try to clean up code --- CubeModLoader/main.cpp | 107 ++++++++++++++++++++-------------------- CubeModLoader/main.h | 30 +++++++++-- CubeModLoader/mutex.cpp | 13 +++++ CubeModLoader/mutex.h | 14 ++++++ 4 files changed, 108 insertions(+), 56 deletions(-) create mode 100644 CubeModLoader/mutex.cpp create mode 100644 CubeModLoader/mutex.h diff --git a/CubeModLoader/main.cpp b/CubeModLoader/main.cpp index ec71f8f..a69b9b7 100644 --- a/CubeModLoader/main.cpp +++ b/CubeModLoader/main.cpp @@ -1,8 +1,10 @@ +#include "main.h" #include #include #include #include "DLL.h" #include "crc.h" +#include "mutex.h" #define MOD_MAJOR_VERSION 4 #define MOD_MINOR_VERSION 2 @@ -14,27 +16,6 @@ #define MODLOADER_NAME "CubeModLoader" -#define no_optimize __attribute__((optimize("O0"))) - -#define MUST_IMPORT(dllname, name)\ -dllname->name = GetProcAddress(dllname->handle, #name);\ - if (!dllname->name) {\ - char ERROR_MESSAGE_POPUP[512] = {0};\ - sprintf(ERROR_MESSAGE_POPUP, "%s does not export " #name ".\n", dllname->fileName.c_str());\ - Popup("Error", ERROR_MESSAGE_POPUP);\ - exit(1);\ - } - -#define IMPORT(dllname, name)\ -dllname->name = GetProcAddress(dllname->handle, #name); - -#define PUSH_ALL "push rax\npush rbx\npush rcx\npush rdx\npush rsi\npush rdi\npush rbp\npush r8\npush r9\npush r10\npush r11\npush r12\npush r13\npush r14\npush r15\n" -#define POP_ALL "pop r15\npop r14\npop r13\npop r12\npop r11\npop r10\npop r9\npop r8\npop rbp\npop rdi\npop rsi\npop rdx\npop rcx\npop rbx\npop rax\n" - -#define PREPARE_STACK "mov rax, rsp \n and rsp, 0xFFFFFFFFFFFFFFF0 \n push rax \n sub rsp, 0x28 \n" -#define RESTORE_STACK "add rsp, 0x28 \n pop rsp \n" - - using namespace std; void* base; // Module base @@ -44,21 +25,6 @@ void* initterm_e; // A pointer to a function which is run extremely soon after s const size_t BYTES_TO_MOVE = 14; // The size of a far jump char initterm_e_remember[BYTES_TO_MOVE]; // We'll use this to store the code we overwrite in initterm_e, so we can put it back later. -void WriteFarJMP(void* source, void* destination) { - DWORD dwOldProtection; - VirtualProtect(source, 14, PAGE_EXECUTE_READWRITE, &dwOldProtection); - char* location = (char*)source; - - // Far jump - *((UINT16*)&location[0]) = 0x25FF; - - // mode - *((UINT32*)&location[2]) = 0x00000000; - - *((UINT64*)&location[6]) = (UINT64)destination; - - VirtualProtect(location, 14, dwOldProtection, &dwOldProtection); -} #include "callbacks/ChatHandler.h" #include "callbacks/P2PRequestHandler.h" @@ -70,23 +36,22 @@ void SetupHandlers() { SetupCheckInventoryFullHandler(); } -void Popup(const char* title, const char* msg ) { - MessageBoxA(0, msg, title, MB_OK | MB_ICONINFORMATION); -} - -void PrintLoadedMods() { - std::string mods("Mods Loaded:\n"); - for (DLL* dll : modDLLs) { - mods += dll->fileName; - mods += "\n"; - } - Popup("Loaded Mods", mods.c_str()); -} // Handles injecting callbacks and the mods +bool already_loaded_mods = false; +mutex already_loaded_mods_mtx; void StartMods() { char msg[256] = {0}; + already_loaded_mods_mtx.lock(); + // Don't allow this to run more than once + if (already_loaded_mods) { + already_loaded_mods_mtx.unlock(); + return; + } + already_loaded_mods = true; + already_loaded_mods_mtx.unlock(); + SetupHandlers(); //Find mods @@ -149,6 +114,8 @@ void StartMods() { } void* StartMods_ptr = (void*)&StartMods; + + void no_optimize ASMStartMods() { asm(PUSH_ALL PREPARE_STACK @@ -199,17 +166,51 @@ void CopyInitializationBack() { } void* CopyInitializationBack_ptr = (void*)&CopyInitializationBack; -bool already_ran = false; + +void Popup(const char* title, const char* msg ) { + MessageBoxA(0, msg, title, MB_OK | MB_ICONINFORMATION); +} + +void PrintLoadedMods() { + std::string mods("Mods Loaded:\n"); + for (DLL* dll : modDLLs) { + mods += dll->fileName; + mods += "\n"; + } + Popup("Loaded Mods", mods.c_str()); +} + +void WriteFarJMP(void* source, void* destination) { + DWORD dwOldProtection; + VirtualProtect(source, 14, PAGE_EXECUTE_READWRITE, &dwOldProtection); + char* location = (char*)source; + + // Far jump + *((UINT16*)&location[0]) = 0x25FF; + + // mode + *((UINT32*)&location[2]) = 0x00000000; + + *((UINT64*)&location[6]) = (UINT64)destination; + + VirtualProtect(location, 14, dwOldProtection, &dwOldProtection); +} + +bool already_initialized = false; +mutex already_initialized_mtx; extern "C" __declspec(dllexport) BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: - base = GetModuleHandle(NULL); - // Don't allow this to run more than once - if (already_ran) + already_initialized_mtx.lock(); + if (already_initialized) { + already_initialized_mtx.unlock(); return true; + } + already_initialized = true; + already_initialized_mtx.unlock(); - already_ran = true; + base = GetModuleHandle(NULL); char msg[256] = {0}; diff --git a/CubeModLoader/main.h b/CubeModLoader/main.h index 59a404a..2154d4b 100644 --- a/CubeModLoader/main.h +++ b/CubeModLoader/main.h @@ -3,10 +3,34 @@ #include "DLL.h" #include + #define no_optimize __attribute__((optimize("O0"))) -using namespace std; -vector modDLLs; -void* base; + void WriteFarJMP(void* source, void* destination); +void Popup(const char* title, const char* msg ); +void PrintLoadedMods(); + +#define MUST_IMPORT(dllname, name)\ +dllname->name = GetProcAddress(dllname->handle, #name);\ + if (!dllname->name) {\ + char ERROR_MESSAGE_POPUP[512] = {0};\ + sprintf(ERROR_MESSAGE_POPUP, "%s does not export " #name ".\n", dllname->fileName.c_str());\ + Popup("Error", ERROR_MESSAGE_POPUP);\ + exit(1);\ + } + +#define IMPORT(dllname, name)\ +dllname->name = GetProcAddress(dllname->handle, #name); + +#define PUSH_ALL "push rax\npush rbx\npush rcx\npush rdx\npush rsi\npush rdi\npush rbp\npush r8\npush r9\npush r10\npush r11\npush r12\npush r13\npush r14\npush r15\n" +#define POP_ALL "pop r15\npop r14\npop r13\npop r12\npop r11\npop r10\npop r9\npop r8\npop rbp\npop rdi\npop rsi\npop rdx\npop rcx\npop rbx\npop rax\n" + +#define PREPARE_STACK "mov rax, rsp \n and rsp, 0xFFFFFFFFFFFFFFF0 \n push rax \n sub rsp, 0x28 \n" +#define RESTORE_STACK "add rsp, 0x28 \n pop rsp \n" + + + + + #endif // MAIN_H diff --git a/CubeModLoader/mutex.cpp b/CubeModLoader/mutex.cpp new file mode 100644 index 0000000..7ff6b91 --- /dev/null +++ b/CubeModLoader/mutex.cpp @@ -0,0 +1,13 @@ +#include "mutex.h" + +mutex::mutex(){ + InitializeCriticalSection(&cs); +} + +void mutex::lock(){ + EnterCriticalSection(&cs); +} + +void mutex::unlock(){ + LeaveCriticalSection(&cs); +} diff --git a/CubeModLoader/mutex.h b/CubeModLoader/mutex.h new file mode 100644 index 0000000..6dd5c79 --- /dev/null +++ b/CubeModLoader/mutex.h @@ -0,0 +1,14 @@ +#ifndef GCC_MUTEX_H +#define GCC_MUTEX_H +#include +// GCC doesn't have a std::mutex, and as of the time of writing, I'm still using GCC. +class mutex { +private: + CRITICAL_SECTION cs; +public: + mutex(); + void lock(); + void unlock(); +}; + +#endif // GCC_MUTEX_H