No longer call LoadLibraryA from WinMain

Author: PinkySmile

CMakeLists.txt

@@ -119,7 +119,6 @@ add_library(ZLIB::ZLIB ALIAS zlibstatic)
 SET(BUILD_SHARED_LIBS OFF)
 SET(LIBZIP_DO_INSTALL OFF)
 SET(ENABLE_COMMONCRYPTO OFF)
-SET(ENABLE_GNUTLS OFF)
 SET(ENABLE_OPENSSL OFF)
 SET(ENABLE_WINDOWS_CRYPTO OFF)
 SET(ENABLE_BZIP2 OFF)
@@ -130,8 +129,8 @@ SET(LIBZIP_DO_INSTALL OFF)
 SET(ZLIB_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/zlib")
 SET(ZLIB_LIBRARY "${CMAKE_SOURCE_DIR}/zlib")
 add_subdirectory(libzip)
-add_dependencies(zip zlibstatic)
-target_include_directories(zip PRIVATE ${ZLIB_INCLUDE_DIR})
+#add_dependencies(zip zlibstatic)
+#target_include_directories(zip PRIVATE ${ZLIB_INCLUDE_DIR})
 
 # detours
 

swrstoys/SWRSToys.cpp

@@ -14,7 +14,7 @@
 #include "SWRSToys.h"
 
 #define CRenderer_Unknown1 ((void (__thiscall *)(int, int))0x404AF0)
-#define REAL_VERSION_STR "alpha 0.3.1"
+#define REAL_VERSION_STR "alpha 0.4.1"
 #ifdef _NOTEX
 #define MOD_REAL_VERSION_STR REAL_VERSION_STR " no texture"
 #else
@@ -101,7 +101,7 @@ LONG WINAPI UnhandledExFilter(PEXCEPTION_POINTERS ExPtr)
 	}
 	printf("%S\n", buf);
 	MessageBoxW(nullptr, buf, L"Fatal Error", MB_ICONERROR);
-	exit(ExPtr->ExceptionRecord->ExceptionCode);
+	return EXCEPTION_CONTINUE_SEARCH;
 }
 
 void loadAssets()
@@ -111,7 +111,6 @@ void loadAssets()
 	loaded = true;
 	SokuLib::FontDescription desc;
 
-	SetUnhandledExceptionFilter(UnhandledExFilter);
 	puts("Placed exception handler!");
 	desc.r1 = 255;
 	desc.r2 = 255;
@@ -545,6 +544,13 @@ int __fastcall myTitleOnRender(SokuLib::Title *This)
 	return ret;
 }
 
+void trapDebugger(bool b)
+{
+	if (!b)
+		return;
+	DebugBreak();
+}
+
 bool Hook(HMODULE this_module)
 {
 #ifdef _DEBUG
@@ -573,6 +579,13 @@ bool Hook(HMODULE this_module)
 		puts("Loading settings file");
 		loadSettings(gameHash, this_module);
 		puts("Placing hooks");
+		SetUnhandledExceptionFilter(UnhandledExFilter);
+		VirtualProtect((PVOID)TEXT_SECTION_OFFSET, TEXT_SECTION_SIZE, PAGE_EXECUTE_WRITECOPY, &old);
+		*(char *)0x81FF00 = 0x90;
+		*(char *)0x81FF01 = 0x50;
+		*(char *)0x81FF04 = 0x90;
+		SokuLib::TamperNearCall(0x81FF05, trapDebugger);
+		VirtualProtect((PVOID)TEXT_SECTION_OFFSET, TEXT_SECTION_SIZE, old, &old);
 		VirtualProtect((PVOID)RDATA_SECTION_OFFSET, RDATA_SECTION_SIZE, PAGE_EXECUTE_WRITECOPY, &old);
 		ogTitleOnProcess = SokuLib::TamperDword(&SokuLib::VTable_Title.onProcess, myTitleOnProcess);
 		ogTitleOnRender  = SokuLib::TamperDword(&SokuLib::VTable_Title.onRender,  myTitleOnRender);

swrstoys/dummy.cpp

@@ -1,6 +1,7 @@
 #include "dummy.h"
 
 #include <Windows.h>
+#include <SokuLib.hpp>
 #include "SWRSToys.h"
 
 FARPROC p_Direct3DShaderValidatorCreate9 = NULL;
@@ -19,11 +20,23 @@ FARPROC p_Direct3DCreate9 = NULL;
 FARPROC p_Direct3DCreate9Ex = NULL;
 
 HMODULE orig_module = NULL;
+HMODULE this_module = NULL;
 
-BOOL APIENTRY DllMain(HMODULE this_module, DWORD ul_reason_for_call, LPVOID) {
+int (*ogSokuMain)(int a, int b, int c, int d);
+
+int SokuMain(int a, int b, int c, int d)
+{
+	Hook(this_module);
+	return ogSokuMain(a, b, c, d);
+}
+
+BOOL APIENTRY DllMain(HMODULE this_module_, DWORD ul_reason_for_call, LPVOID) {
 	switch (ul_reason_for_call) {
 	case DLL_PROCESS_ATTACH: {
 		wchar_t sys_dir[MAX_PATH];
+		DWORD old;
+
+		this_module = this_module_;
 		if (FALSE == ::GetSystemDirectoryW(sys_dir, MAX_PATH)) {
 			return FALSE;
 		}
@@ -48,9 +61,9 @@ BOOL APIENTRY DllMain(HMODULE this_module, DWORD ul_reason_for_call, LPVOID) {
 		p_Direct3DCreate9 = ::GetProcAddress(orig_module, "Direct3DCreate9");
 		p_Direct3DCreate9Ex = ::GetProcAddress(orig_module, "Direct3DCreate9Ex");
 
-		if (!Hook(this_module)) {
-			return FALSE;
-		}
+		VirtualProtect((PVOID)TEXT_SECTION_OFFSET, TEXT_SECTION_SIZE, PAGE_EXECUTE_WRITECOPY, &old);
+		ogSokuMain = SokuLib::TamperNearJmpOpr(0x821844, SokuMain);
+		VirtualProtect((PVOID)TEXT_SECTION_OFFSET, TEXT_SECTION_SIZE, old, &old);
 		break;
 	}
 	case DLL_THREAD_ATTACH: