Merge remote-tracking branch 'Blu3train/newAOSengineHooks'

texthook/engine/engine.cc

@@ -12224,8 +12224,116 @@ bool InsertAOS2Hook()
   return true;
 }
 
+bool InsertAOS2newHook() {
+	//by Blu3train
+	BYTE bytes[] = {
+		0x0F, 0xB6, 0x07,
+		0xC1, 0xE0, 0x08,
+		0x0B, 0xC1,
+		0x8B, 0x0D, XX4,
+		0x81, 0xE3, 0xFF, 0xFF, 0xFF, 0x00,
+		0x89, 0x6C, 0x24, 0x14,
+		0x89, 0x44, 0x24, 0x0C,
+		0x85, 0xED
+	};
+	ULONG addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStopAddress);
+	if (!addr) {
+		ConsoleOutput("vnreng:AOS2new: pattern not found");
+		return false;
+	}
+	HookParam hp = {};
+	hp.address = addr;
+	hp.offset = pusha_edi_off - 4; //edi
+	hp.length_offset = 1;
+	hp.type  = NO_CONTEXT | DATA_INDIRECT;
+	hp.index =0;
+
+	ConsoleOutput("vnreng: INSERT AOS2new");
+
+	NewHook(hp, "AOS2new");
+	return true;
+
+}
+
+bool InsertAOS2Hooks() {
+  bool ok = InsertAOS2newHook();
+  ok = InsertAOS2Hook() || ok;
+  return ok;
+}
+
+bool InsertAOS3Hook() {
+	//by Blu3train
+	BYTE bytes[] = {
+		0x8B, 0x15, XX4,
+		0x0F, 0xBE, 0x02,
+		0xC1, 0xE0, 0x08,
+		0x8B, 0x0D, XX4,
+		0x0F, 0xBE, 0x51, 0x01,
+		0x0B, 0xC2,
+		0x66, 0x89, 0x85, 0x98, 0xFF, 0xFE, 0xFF,
+		0xA1, XX4,
+		0x50
+	};
+	ULONG addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStopAddress);
+	if (!addr) {
+		ConsoleOutput("vnreng:AOS3: pattern not found");
+		return false;
+	}
+	HookParam hp = {};
+	hp.address = addr;
+	hp.offset = pusha_eax_off - 4; //eax
+	hp.length_offset = 1;
+	//hp.type  = NO_CONTEXT | DATA_INDIRECT;
+	hp.type  = DATA_INDIRECT;
+	hp.index =0;
+
+	ConsoleOutput("vnreng: INSERT AOS3");
+
+	NewHook(hp, "AOS3");
+	return true;
+
+}
+
+bool CarriageReturnCharToSpaceFilter(LPVOID data, DWORD *size, HookParam *, BYTE)
+{
+  CharReplacer(reinterpret_cast<LPSTR>(data), reinterpret_cast<size_t *>(size), '\r', ' ');
+  return true;
+}
+
+bool InsertAOS4Hook() {
+	//by Blu3train
+	/*
+	* Sample games:
+	* https://vndb.org/v15699
+	*/
+	BYTE bytes[] = {
+		0x55,                        // push ebp        << hook here
+		0x8B, 0xEC,                  // mov ebp,esp
+		0x83, 0xEC, 0x14,            // sub esp,14
+		0xA1, XX4                    // mov eax,[spiral.exe+C0104]
+	};
+	ULONG range = min(processStopAddress - processStartAddress, MAX_REL_ADDR);
+	ULONG addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStartAddress + range);
+	if (!addr) {
+		ConsoleOutput("vnreng:AOS4: pattern not found");
+		return false;
+	}
+	HookParam hp = {};
+	hp.address = addr;
+	hp.offset = pusha_edx_off - 4; //edx
+	hp.length_offset = 1;
+	hp.type  = NO_CONTEXT | DATA_INDIRECT;
+	hp.filter_fun = CarriageReturnCharToSpaceFilter; 
+	hp.index =0;
+
+	ConsoleOutput("vnreng: INSERT AOS4");
+
+	NewHook(hp, "AOS4");
+	return true;
+}
+
 bool InsertAOSHook()
-{ return InsertAOS1Hook() ||  InsertAOS2Hook();}
+{ return InsertAOS1Hook() ||  InsertAOS2Hooks() || InsertAOS3Hook() || InsertAOS4Hook();}
 
   
 /**