Эх сурвалжийг харах

1、去除原本的Connect劫持; 2、去除异常弹框的劫持:通过验证,如果在连接不上Connect时,在第三次Connect程序异常弹框:privileged instruction

JeffWang 3 жил өмнө
parent
commit
a099349bd0

+ 11 - 10
Source/OGCAssist/OGCAssist/OGCAssist.cpp

@@ -80,6 +80,7 @@ namespace Assist
 #pragma endregion
 
 #pragma region Connect按钮劫持
+#if 0
 		//00415ECB | 0F84 6A040000 | je demo.41633B 
 		_cd_Connect.myCall = Call_MyConnect;
 		// 00415ED1 | 6A 00                  | push 0 
@@ -91,7 +92,7 @@ namespace Assist
 		memset(_cd_Connect.szMyCallData, 0x90, CALL_LEN);
 		_cd_Connect.szMyCallData[0] = 0xE9; // 汇编硬编码:jmp [4字节地址];
 		*(LPDWORD)(&_cd_Connect.szMyCallData[1]) = (DWORD)_cd_Connect.myCall - _cd_Connect.dwOriginalAddr - JMP_DLEN;
-
+#endif
 		// 连接成功时;
 		_cd_Connect_True.myCall = Call_MyConnectTrue;
 		// 00415ED1 | 6A 00                  | push 0 
@@ -234,8 +235,8 @@ namespace Assist
 	BOOL HijackedAllCall()
 	{
 		BOOL bHijack=FALSE;
-		if ( !(bHijack = HijackedCall(&_cd_Connect)) )
-			goto end;
+		//if ( !(bHijack = HijackedCall(&_cd_Connect)) )
+		//	goto end;
 
 		if ( !(bHijack = HijackedCall(&_cd_Connect_True)) )
 			goto end;
@@ -258,8 +259,8 @@ namespace Assist
 		if ( !(bHijack = HijackedCall(&_cd_Go_SetCommunicationError)) )
 			goto end;
 
-		if ( !(bHijack = HijackedCall(&_cd_ExternalException)) )
-			goto end;
+		//if ( !(bHijack = HijackedCall(&_cd_ExternalException)) )
+		//	goto end;
 
 		if ( !(bHijack = HijackedCall(&_cd_CheckFW)) )
 			goto end;
@@ -276,8 +277,8 @@ end:
 	BOOL RestoreAllCall()
 	{
 		BOOL bRestor = FALSE;
-		if ( !(bRestor = RecoveryCall(&_cd_Connect)) )
-			goto end;
+		//if ( !(bRestor = RecoveryCall(&_cd_Connect)) )
+		//	goto end;
 
 		if ( !(bRestor = RecoveryCall(&_cd_Connect_True)) )
 			goto end;
@@ -300,8 +301,8 @@ end:
 		if ( !(bRestor = RecoveryCall(&_cd_Go_SetCommunicationError)) )
 			goto end;
 
-		if ( !(bRestor = RecoveryCall(&_cd_ExternalException)) )
-			goto end;
+		//if ( !(bRestor = RecoveryCall(&_cd_ExternalException)) )
+		//	goto end;
 
 		if ( !(bRestor = RecoveryCall(&_cd_CheckFW)) )
 			goto end;
@@ -727,7 +728,7 @@ namespace Assist
 
 		Utility::g_pPipeClient->SendPackage(head, msg);
 #pragma endregion
-		::exit(0);
+		//::exit(0);
 	}
 
 	void __declspec(naked) Call_MyExternalException()