From d4a1591a509e39b73b0602771bcdadadedff8580 Mon Sep 17 00:00:00 2001 From: d1str4ught <> Date: Thu, 28 Aug 2025 19:54:23 +0200 Subject: [PATCH] hackshield and xtrap codes removed --- src/UserInterface/AccountConnector.cpp | 11 - src/UserInterface/HackShield.cpp | 380 ------------------ src/UserInterface/Hackshield.h | 23 -- src/UserInterface/HackshieldLicense.h | 0 src/UserInterface/HackshieldLicense_metin2.h | 5 - .../HackshieldLicense_metin2client.h | 5 - src/UserInterface/Locale_inc_BR.h | 2 - src/UserInterface/Locale_inc_CA.h | 2 - src/UserInterface/Locale_inc_EU2.h | 2 - src/UserInterface/Locale_inc_JP.h | 3 - src/UserInterface/Locale_inc_KO.h | 3 - src/UserInterface/Locale_inc_dev.h | 3 - src/UserInterface/Packet.h | 25 -- src/UserInterface/PythonApplication.cpp | 14 +- src/UserInterface/PythonApplicationEvent.cpp | 1 - src/UserInterface/PythonNetworkStream.cpp | 3 - src/UserInterface/PythonNetworkStream.h | 4 - .../PythonNetworkStreamPhaseGame.cpp | 8 - .../PythonNetworkStreamPhaseHandShake.cpp | 71 ---- .../PythonNetworkStreamPhaseLogin.cpp | 3 - src/UserInterface/UserInterface.cpp | 22 - src/UserInterface/WiseLogicXTrap.cpp | 81 ---- src/UserInterface/WiseLogicXTrap.h | 8 - 23 files changed, 1 insertion(+), 678 deletions(-) delete mode 100644 src/UserInterface/HackShield.cpp delete mode 100644 src/UserInterface/Hackshield.h delete mode 100644 src/UserInterface/HackshieldLicense.h delete mode 100644 src/UserInterface/HackshieldLicense_metin2.h delete mode 100644 src/UserInterface/HackshieldLicense_metin2client.h delete mode 100644 src/UserInterface/WiseLogicXTrap.cpp delete mode 100644 src/UserInterface/WiseLogicXTrap.h diff --git a/src/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp index 333ff8d..a04e82f 100644 --- a/src/UserInterface/AccountConnector.cpp +++ b/src/UserInterface/AccountConnector.cpp @@ -5,9 +5,6 @@ #include "../EterBase/tea.h" #include "../EterPack/EterPackManager.h" -#include "Hackshield.h" -#include "WiseLogicXTrap.h" - // CHINA_CRYPT_KEY extern DWORD g_adwEncryptKey[4]; extern DWORD g_adwDecryptKey[4]; @@ -306,14 +303,6 @@ bool CAccountConnector::__AuthState_RecvPhase() } #else /* USE_OPENID */ -#ifdef USE_AHNLAB_HACKSHIELD - HackShield_SetUserInfo(m_strID.c_str()); -#endif -#ifdef XTRAP_CLIENT_ENABLE - XTrap_SetUserInfo(m_strID.c_str(), NULL, NULL, NULL, NULL); -#endif - - TPacketCGLogin3 LoginPacket; LoginPacket.header = HEADER_CG_LOGIN3; diff --git a/src/UserInterface/HackShield.cpp b/src/UserInterface/HackShield.cpp deleted file mode 100644 index 6219c14..0000000 --- a/src/UserInterface/HackShield.cpp +++ /dev/null @@ -1,380 +0,0 @@ -#include "StdAfx.h" -#include "Hackshield.h" - -#ifdef USE_AHNLAB_HACKSHIELD - -#if defined(LOCALE_SERVICE_EUROPE) -#define METIN2HS_MONITORING_SERVER_ADDR "79.110.88.84" -#elif -#define METIN2HS_MONITORING_SERVER_ADDR "79.110.88.84" // GF -#endif -//#define METIN2HS_MONITORING_SERVER_ADDR "119.192.130.160" //김용욱 pc - -#include METIN2HS_INCLUDE_HSUPCHK -#include METIN2HS_INCLUDE_HSUSERUTIL -#include METIN2HS_INCLUDE_HSHIELD -#include METIN2HS_INCLUDE_HSHIELDLIBLINK - -#define MA_MAX_PATH MAX_PATH -#define MA_T -#define MA_TCHAR char -#define MA_StringFormat snprintf -#define MA_ARRAYCOUNT sizeof - -static DWORD gs_dwMainThreadID = 0; - -static bool gs_isHackDetected = false; -static char gs_szHackMsg[256]; - -void MA_PathSplit(MA_TCHAR* src, MA_TCHAR* branch, size_t branchLen, MA_TCHAR* leaf, size_t leafLen) -{ - char* p = src; - char* n = p; - while (n = strchr(p, '\\')) - p = n + 1; - - if (branch) - strncpy(branch, src, p - src); - - if (leaf) - strcpy(leaf, p); -} - -void MA_PathMerge(MA_TCHAR* dst, size_t dstLen, MA_TCHAR* branch, MA_TCHAR* leaf) -{ - snprintf(dst, dstLen, "%s\\%s", branch, leaf); -} - -int __stdcall AhnHS_Callback(long lCode, long lParamSize, void* pParam) -{ - switch (lCode) - { - //Engine Callback - case AHNHS_ENGINE_DETECT_GAME_HACK: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_GAME_HACK\n%s"), (char*)pParam); - gs_isHackDetected = true; - break; - } - //창모드 해킹툴 감지 - case AHNHS_ENGINE_DETECT_WINDOWED_HACK: - { - //MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_WINDOWED_HACK")); - //gs_isHackDetected = true; - break; - } - - //Speed 관련 - case AHNHS_ACTAPC_DETECT_SPEEDHACK: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_SPEED_HACK")); - gs_isHackDetected = true; - break; - } - - //디버깅 방지 - case AHNHS_ACTAPC_DETECT_KDTRACE: -// case AHNHS_ACTAPC_DETECT_KDTRACE_CHANGED: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_DEBUGING(checkCode=%x)"), lCode); - gs_isHackDetected = true; - break; - } - - case AHNHS_ACTAPC_DETECT_AUTOMACRO: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_MACRO(checkCode=%x)"), lCode); - gs_isHackDetected = true; - break; - } - - // 코드 패치 감지 - case AHNHS_ACTAPC_DETECT_ABNORMAL_MEMORY_ACCESS: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_MEMORY_ACCESS\n%s"), (char*)pParam); - gs_isHackDetected = true; - break; - } - - //메모리 변조 감지. - case AHNHS_ACTAPC_DETECT_MEM_MODIFY_FROM_LMP: //임의 기준 주소 (Randomized Base Address) 확인해보기. Linker->Advanced->(/DYNAMICBASE:NO) - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_MEMORY_MODIFY")); - gs_isHackDetected = true; - - } - break; - - // 핵쉴드 로컬 메모리 보호 기능이 정상적이지 않습니다. - case AHNHS_ACTAPC_DETECT_LMP_FAILED: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("LOCAL_MEMORY_PROTECT_FAILED")); - gs_isHackDetected = true; - - } - break; - - //그외 해킹 방지 기능 이상 -// case AHNHS_ACTAPC_DETECT_AUTOMOUSE: - case AHNHS_ACTAPC_DETECT_DRIVERFAILED: - case AHNHS_ACTAPC_DETECT_HOOKFUNCTION: -// case AHNHS_ACTAPC_DETECT_MESSAGEHOOK: -// case AHNHS_ACTAPC_DETECT_MODULE_CHANGE: - case AHNHS_ACTAPC_DETECT_ENGINEFAILED: - case AHNHS_ACTAPC_DETECT_CODEMISMATCH: -// case AHNHS_ACTAPC_DETECT_PROTECTSCREENFAILED: - { - MA_StringFormat(gs_szHackMsg, MA_ARRAYCOUNT(gs_szHackMsg), MA_T("DETECT_HACKING(checkCode = %x)\n"), lCode); - gs_isHackDetected = true; - break; - } - } - return 1; -} - -bool HackShield_PollEvent() -{ - return gs_isHackDetected; - //return false; -} - -bool HackShield_Init() -{ - - MA_TCHAR szModuleDirPath[MA_MAX_PATH]; - ::GetCurrentDirectory(MA_ARRAYCOUNT(szModuleDirPath), szModuleDirPath); - -#ifndef _DEBUG - //핵쉴드 업데이트 - DWORD dwUpRet = 0; - MA_TCHAR szFullFilePath[MA_MAX_PATH]; - // 핵쉴드 폴더 위치를 지정합니다. - MA_PathMerge(szFullFilePath, MA_ARRAYCOUNT(szFullFilePath), szModuleDirPath, "hshield"); - AHNHS_EXT_ERRORINFO HsExtError = {0,}; - - // _AhnHS_HSUpdate 함수 호출 - dwUpRet = _AhnHS_HSUpdateEx( szFullFilePath, // 핵쉴드 폴더 경로 - 1000 * 600, // 업데이트 전체 타임 아웃 - METIN2HS_CODE, // 게임 코드 - AHNHSUPDATE_CHKOPT_HOSTFILE| AHNHSUPDATE_CHKOPT_GAMECODE, - HsExtError, - 1000* 20 ); // 서버 연결 타임아웃 - - // Ex 함수를 사용하실때는 반드시 HSUpSetEnv.exe 설정 툴로 env 파일에 - // 게임 코드를 입력하셔야 합니다. - if ( dwUpRet != ERROR_SUCCESS) - { - - // 에러 처리 - switch ( dwUpRet ) - { - case HSERROR_ENVFILE_NOTREAD: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_ENVFILE_NOTREAD"), "HACK_SHIELD", MB_OK); - break; - case HSERROR_ENVFILE_NOTWRITE: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_ENVFILE_NOTWRITE"), "HACK_SHIELD", MB_OK); - break; - case HSERROR_NETWORK_CONNECT_FAIL: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_NETWORK_CONNECT_FAIL"), "HACK_SHIELD", MB_OK); - break; - case HSERROR_HSUPDATE_TIMEOUT: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_HSUPDATE_TIMEOUT"), "HACK_SHIELD", MB_OK); - break; - case HSERROR_MISMATCH_ENVFILE: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_MISMATCH_ENVFILE"), "HACK_SHIELD", MB_OK); - break; - case HSERROR_HOSTFILE_MODIFICATION: - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR : HSERROR_HOSTFILE_MODIFICATION"), "HACK_SHIELD", MB_OK); - break; - default: - break; - } - - MessageBox(NULL, MA_T("HACK_SHIELD_UPDATE_ERROR"), "HACK_SHIELD", MB_OK); - - return false; - - } -#endif - - MA_TCHAR szInterfaceFilePath[MA_MAX_PATH]; - { - if (!_AhnHSUserUtil_IsAdmin() && !_AhnHsUserUtil_IsEnableHSAdminRights()) - { - DWORD dwRet = _AhnHsUserUtil_CreateUser(); - switch (dwRet) - { - case HSUSERUTIL_ERR_OK: // pass - break; - case HSUSERUTIL_ERR_NOT_ADMIN: // 유저 실행을 허용하므로 에러 아님 - break; - case HSUSERUTIL_ERR_NOT_NT: // 98 유저 실행을 허용하므로 에러 아님 - break; - case HSUSERUTIL_ERR_DELHIDEIDINFO_FAIL: - MessageBox(NULL, MA_T("DEL_SHADOW_HIDDEN_ERROR"), "HACK_SHIELD", MB_OK); - return false; - case HSUSERUTIL_ERR_DELSHADOWACNT_FAIL: - MessageBox(NULL, MA_T("DEL_SHADOW_ACCOUNT_ERROR"), "HACK_SHIELD", MB_OK); - return false; - case HSUSERUTIL_ERR_ADDSHADOWACNT_FAIL: - MessageBox(NULL, MA_T("ADD_SHADOW_ACCOUNT_ERROR"), "HACK_SHIELD", MB_OK); - return false; - } - - } - -#ifdef _DEBUG - MA_PathMerge(szInterfaceFilePath, MA_ARRAYCOUNT(szInterfaceFilePath), szModuleDirPath, "hshield\\EHsvc.dll"); -#else - MA_PathMerge(szInterfaceFilePath, MA_ARRAYCOUNT(szInterfaceFilePath), szModuleDirPath, "hshield\\EHsvc.dll"); -#endif - } - -#ifndef _DEBUG - { - AHNHS_EXT_ERRORINFO HsExtError = { 0, }; - strcpy(HsExtError.szServer, METIN2HS_MONITORING_SERVER_ADDR); //모니터링 주소 - strcpy(HsExtError.szGameVersion, "1.0.0.0"); //Game 버전 - strcpy(HsExtError.szUserId, "Metin2User_test"); //유저 ID - - DWORD dwRet = _AhnHS_StartMonitor (HsExtError, szInterfaceFilePath); - if( dwRet != ERROR_SUCCESS ) - { - MessageBox(NULL, MA_T("START_MONITORING_SERVICE_ERROR"), "HACK_SHIELD", MB_OK); - } - } -#endif - - { - int nRet = _AhnHS_Initialize(szInterfaceFilePath, AhnHS_Callback, - METIN2HS_CODE, - METIN2HS_LICENSE, - AHNHS_CHKOPT_SPEEDHACK - | AHNHS_CHKOPT_READWRITEPROCESSMEMORY - | AHNHS_CHKOPT_KDTRACER -// | AHNHS_CHKOPT_OPENPROCESS - | AHNHS_CHKOPT_AUTOMOUSE - | AHNHS_CHKOPT_MESSAGEHOOK - | AHNHS_CHKOPT_PROTECT_D3DX - | AHNHS_CHKOPT_LOCAL_MEMORY_PROTECTION // 코드 영역 로딩 보호 - //| AHNHS_CHKOPT_ANTIFREESERVER // 프리 서버 접속 방지 - | AHNHS_USE_LOG_FILE -// | AHNHS_ALLOW_SVCHOST_OPENPROCESS - //| AHNHS_ALLOW_LSASS_OPENPROCESS // 신용 카드 결제 관련 - //| AHNHS_ALLOW_CSRSS_OPENPROCESS // 신용 카드 결제 관련 - //| AHNHS_CHKOPT_SELF_DESTRUCTION // 강제 종료 처리: 콜백 처리 주의 - | AHNHS_CHKOPT_PROCESSSCAN - | AHNHS_CHKOPT_UPDATED_FILE_CHECK - | AHNHS_CHKOPT_SEND_MONITOR_ONCE // 모니터링용: 1회만 보냄 - | AHNHS_CHKOPT_SEND_MONITOR_DELAY // 모니터링용: 아이디를 천천히 보냄 - | AHNHS_DONOT_TERMINATE_PROCESS, // 서버 알림 - AHNHS_SPEEDHACK_SENSING_RATIO_NORMAL - ); - - if (nRet != HS_ERR_OK) - { - //Error 처리 - switch(nRet) - { - case HS_ERR_ANOTHER_SERVICE_RUNNING: - { - MessageBox(NULL, MA_T("ANOTHER_SERVICE_RUNNING"), "HACK_SHIELD", MB_OK); - break; - } - case HS_ERR_INVALID_LICENSE: - { - MessageBox(NULL, MA_T("INVALID_LICENSE"), "HACK_SHIELD", MB_OK); - break; - } - case HS_ERR_INVALID_FILES: - { - MessageBox(NULL, MA_T("INVALID_FILES"), "HACK_SHIELD", MB_OK); - break; - } - case HS_ERR_DEBUGGER_DETECT: - { - MessageBox(NULL, MA_T("DEBUG_DETECT"), "HACK_SHIELD", MB_OK); - break; - } - case HS_ERR_NEED_ADMIN_RIGHTS: - { - MessageBox(NULL, MA_T("NEED_ADMIN_RIGHTS"), "HACK_SHIELD", MB_OK); - break; - } - case HS_ERR_COMPATIBILITY_MODE_RUNNING: - { - MessageBox(NULL, MA_T("COMPATIBILITY_MODE_RUNNING"), "HACK_SHIELD", MB_OK); - break; - } - default: - { - MA_TCHAR szMsg[255]; - MA_StringFormat(szMsg, MA_ARRAYCOUNT(szMsg), MA_T("UNKNOWN_ERROR(errorCode=%x)"), nRet); - MessageBox(NULL, szMsg, "HACK_SHIELD", MB_OK); - break; - } - } - return false; - } - } - - gs_dwMainThreadID = GetCurrentThreadId(); - - { - int nRet = _AhnHS_StartService(); - assert(nRet != HS_ERR_NOT_INITIALIZED); - assert(nRet != HS_ERR_ALREADY_SERVICE_RUNNING); - - if (nRet != HS_ERR_OK) - { - MA_TCHAR szMsg[255]; - MA_StringFormat(szMsg, MA_ARRAYCOUNT(szMsg), MA_T("START_SERVICE_ERROR(errorCode=%x)"), nRet); - MessageBox(NULL, szMsg, "HACK_SHIELD", MB_OK); - return false; - } - } - return true; -} - -bool HackShield_Shutdown() -{ - if (gs_dwMainThreadID) - { - gs_dwMainThreadID = 0; - _AhnHS_StopService(); - } - - int nRet = _AhnHS_Uninitialize(); - if (nRet != HS_ERR_OK) - { - MA_TCHAR szMsg[255]; - MA_StringFormat(szMsg, MA_ARRAYCOUNT(szMsg), MA_T("UNINITIALIZE_ERROR(errorCode=%x)"), nRet); - MessageBox(NULL, szMsg, "HACK_SHIELD", MB_OK); - } - - if (_AhnHsUserUtil_CheckHSShadowAccount()) - { - _AhnHsUserUtil_DeleteUser(); - } - - if (gs_isHackDetected) - { - MessageBox(NULL, gs_szHackMsg, "HACK_SHIELD", MB_OK); - } - return true; -} - -#define PREFIX_LOCALE "locale/" - -void HackShield_SetUserInfo(const char* szAccountName) -{ - MA_TCHAR szUserInfo[256]; - - const char* szLocaleName = LocaleService_IsYMIR() ? MA_T("unknown") : LocaleService_GetLocalePath(); - if( strncmp( szLocaleName, PREFIX_LOCALE, strlen(PREFIX_LOCALE) ) == 0 ) - szLocaleName += strlen(PREFIX_LOCALE); - MA_StringFormat(szUserInfo, MA_ARRAYCOUNT(szUserInfo), MA_T("%s / %s"), szAccountName, szLocaleName ); - _AhnHS_SetUserId(szUserInfo); -} - -#endif /* USE_AHNLAB_HACKSHIELD */ diff --git a/src/UserInterface/Hackshield.h b/src/UserInterface/Hackshield.h deleted file mode 100644 index 998a34b..0000000 --- a/src/UserInterface/Hackshield.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#ifdef USE_AHNLAB_HACKSHIELD - -#include "HackshieldLicense.h" - -#ifndef METIN2HS_INCLUDE -//#define METIN2HS_INCLUDE hshield-5.4.8.1 -#define METIN2HS_INCLUDE hackshield //2012년 3월 -#endif - -#define METIN2HS_INCLUDE_HSUPCHK -#define METIN2HS_INCLUDE_HSUSERUTIL -#define METIN2HS_INCLUDE_HSHIELD -#define METIN2HS_INCLUDE_HSHIELDLIBLINK -#define METIN2HS_INCLUDE_ANTICPXSVR - -bool HackShield_Init(); -bool HackShield_Shutdown(); -bool HackShield_PollEvent(); -void HackShield_SetUserInfo(const char* szAccountName); - -#endif /* USE_AHNLAB_HACKSHIELD */ diff --git a/src/UserInterface/HackshieldLicense.h b/src/UserInterface/HackshieldLicense.h deleted file mode 100644 index e69de29..0000000 diff --git a/src/UserInterface/HackshieldLicense_metin2.h b/src/UserInterface/HackshieldLicense_metin2.h deleted file mode 100644 index 380647d..0000000 --- a/src/UserInterface/HackshieldLicense_metin2.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define METIN2HS_EXE_FILE_NAME "metin2.bin" -#define METIN2HS_CODE 5858 -#define METIN2HS_LICENSE "2A126BBDC6C61351124B2872" diff --git a/src/UserInterface/HackshieldLicense_metin2client.h b/src/UserInterface/HackshieldLicense_metin2client.h deleted file mode 100644 index f60dc54..0000000 --- a/src/UserInterface/HackshieldLicense_metin2client.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define METIN2HS_EXE_FILE_NAME "metin2client.bin" -#define METIN2HS_CODE 5857 -#define METIN2HS_LICENSE "B1FECACB51BD40B919EFCDB9" diff --git a/src/UserInterface/Locale_inc_BR.h b/src/UserInterface/Locale_inc_BR.h index 3e05356..1e3674d 100644 --- a/src/UserInterface/Locale_inc_BR.h +++ b/src/UserInterface/Locale_inc_BR.h @@ -1,7 +1,5 @@ #define LOCALE_SERVICE_BRAZIL // 브라질 -#define XTRAP_CLIENT_ENABLE -#define XTRAP_PATCH_ARG "660970B4483BDC32C5266D9844CFED6230832A3E2F95F8DD45DB9AED6AE8B837900845956432BD8F2D14136A8CF8BD970A93B783971789382A493B68C5C2BA650F7D04245246E41FB1670C4E955F790A585C3F5D8EB0BADD81C6DD2DB7" #define ENABLE_COSTUME_SYSTEM #define ENABLE_ENERGY_SYSTEM #define ENABLE_DRAGON_SOUL_SYSTEM \ No newline at end of file diff --git a/src/UserInterface/Locale_inc_CA.h b/src/UserInterface/Locale_inc_CA.h index 6eaf114..7c088c2 100644 --- a/src/UserInterface/Locale_inc_CA.h +++ b/src/UserInterface/Locale_inc_CA.h @@ -1,6 +1,4 @@ #define LOCALE_SERVICE_CANADA // 캐나다 -#define XTRAP_CLIENT_ENABLE -#define XTRAP_PATCH_ARG "660970B4953BDCCFC5266D9844CFED62D9D88487BAFA5824E622544D919AC5C535B7B5BB27DF7189499DA1EFA3745A052BE7AE8B12275EDE90BAFDD333407BF80F7D04245246E40AF7650C4AD8583917B21AD7B2AFDE3D4F588C800D128456E1DFEC" #define ENABLE_COSTUME_SYSTEM #define ENABLE_ENERGY_SYSTEM diff --git a/src/UserInterface/Locale_inc_EU2.h b/src/UserInterface/Locale_inc_EU2.h index d428969..2604415 100644 --- a/src/UserInterface/Locale_inc_EU2.h +++ b/src/UserInterface/Locale_inc_EU2.h @@ -1,7 +1,5 @@ #define LOCALE_SERVICE_EUROPE // 유럽 -//#define USE_AHNLAB_HACKSHIELD - //#define CHECK_LATEST_DATA_FILES #define LSS_SECURITY_KEY "1234abcd5678efgh" diff --git a/src/UserInterface/Locale_inc_JP.h b/src/UserInterface/Locale_inc_JP.h index a7f6e34..bca21fe 100644 --- a/src/UserInterface/Locale_inc_JP.h +++ b/src/UserInterface/Locale_inc_JP.h @@ -5,9 +5,6 @@ #define CHECK_LATEST_DATA_FILES -#define XTRAP_CLIENT_ENABLE -#define XTRAP_PATCH_ARG "660970B45839DC81C5456D9844CFED62303A1E1A50FFCBE4EA66A304B961F2C32CE50A020A6641FABDF1012DCA07BBC05387C8AD0D4781097428789FE68B54150F7D04245246E404A17B4351DC553907911A3FD51AEE1C697A03BC66B3A378" - #define ENABLE_COSTUME_SYSTEM #define ENABLE_ENERGY_SYSTEM #define USE_OPENID diff --git a/src/UserInterface/Locale_inc_KO.h b/src/UserInterface/Locale_inc_KO.h index e53d11c..ca7ecee 100644 --- a/src/UserInterface/Locale_inc_KO.h +++ b/src/UserInterface/Locale_inc_KO.h @@ -1,8 +1,5 @@ #include "Locale_inc_EU.h" -//#define XTRAP_CLIENT_ENABLE -#define XTRAP_PATCH_ARG "660970B47839DCBFC5206D9844CFED627251D23A44458651BD1F0E57E26D7C85B4CC00C30B1D1724026D5F65A662992141DB6C233A24040C5A6BCD6D25A5576D0F7D04245246E417A4610E56955D721985C1414D9E254947FC" - #define ENABLE_COSTUME_SYSTEM #define ENABLE_ENERGY_SYSTEM #define ENABLE_DRAGON_SOUL_SYSTEM diff --git a/src/UserInterface/Locale_inc_dev.h b/src/UserInterface/Locale_inc_dev.h index 3757066..ad2f961 100644 --- a/src/UserInterface/Locale_inc_dev.h +++ b/src/UserInterface/Locale_inc_dev.h @@ -1,8 +1,5 @@ #include "Locale_inc_EU.h" -//#define XTRAP_CLIENT_ENABLE -//#define XTRAP_PATCH_ARG "660970B47839DCBFC5206D9844CFED627251D23A44458651BD1F0E57E26D7C85B4CC00C30B1D1724026D5F65A662992141DB6C233A24040C5A6BCD6D25A5576D0F7D04245246E417A4610E56955D721985C1414D9E254947FC" - #define ENABLE_COSTUME_SYSTEM #define ENABLE_ENERGY_SYSTEM #define ENABLE_DRAGON_SOUL_SYSTEM diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index 5508bc2..6df1e20 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -1,9 +1,5 @@ #pragma once -#ifdef USE_AHNLAB_HACKSHIELD -#include "Hackshield.h" -#include METIN2HS_INCLUDE_ANTICPXSVR -#else #pragma pack(push) //기존 alignment 저장 #pragma pack(8) @@ -16,7 +12,6 @@ typedef struct _AHNHS_TRANS_BUFFER } AHNHS_TRANS_BUFFER, *PAHNHS_TRANS_BUFFER; #pragma pack(pop) // 기존 alignment 복구. -#endif /* !USE_AHNLAB_HACKSHIELD */ #include "../gamelib/RaceData.h" @@ -149,9 +144,6 @@ enum HEADER_CG_RUNUP_MATRIX_ANSWER = 201, HEADER_CG_NEWCIBN_PASSPOD_ANSWER = 202, - HEADER_CG_HS_ACK = 203, - HEADER_CG_XTRAP_ACK = 204, - HEADER_CG_DRAGON_SOUL_REFINE = 205, HEADER_CG_STATE_CHECKER = 206, @@ -345,10 +337,6 @@ enum HEADER_GC_AUTOBAN_QUIZ = 206, // END_OF_AUTOBAN - HEADER_GC_HS_REQUEST = 207, // Origially it's 204 on devel branch -#else - HEADER_GC_HS_REQUEST = 204, - HEADER_GC_XTRAP_CS1_REQUEST = 205, #endif #ifdef __AUCTION__ @@ -2695,19 +2683,6 @@ typedef struct packet_state TPixelPosition kPPos; } TPacketCCState; -typedef struct packet_hs_check_req -{ - uint8_t bHeader; - AHNHS_TRANS_BUFFER Req; -} TPacketHSCheck; - -//NOTE : recv/send에 공통으로 생김, bPacketData의 내용만 바뀐다. -typedef struct packet_xtrap_verify -{ - uint8_t bHeader; - uint8_t bPacketData[128]; - -} TPacketXTrapCSVerify; // AUTOBAN typedef struct packet_autoban_quiz { diff --git a/src/UserInterface/PythonApplication.cpp b/src/UserInterface/PythonApplication.cpp index 48c09e8..805a8ac 100644 --- a/src/UserInterface/PythonApplication.cpp +++ b/src/UserInterface/PythonApplication.cpp @@ -11,9 +11,7 @@ #include "ProcessScanner.h" -#include "HackShield.h" #include "NProtectGameGuard.h" -#include "WiseLogicXTrap.h" #include "CheckLatestFiles.h" extern void GrannyCreateSharedDeformBuffer(); @@ -267,13 +265,7 @@ bool CPythonApplication::Process() if (CheckLatestFiles_PollEvent()) return false; #endif -#ifdef USE_AHNLAB_HACKSHIELD - if (HackShield_PollEvent()) - return false; -#endif -#ifdef XTRAP_CLIENT_ENABLE - XTrap_PollEvent(); -#endif + ELTimer_SetFrameMSec(); // m_Profiler.Clear(); @@ -982,10 +974,6 @@ bool CPythonApplication::Create(PyObject * poSelf, const char * c_szName, int wi if (!GameGuard_Run(CMSWindow::GetWindowHandle())) return false; #endif -#ifdef XTRAP_CLIENT_ENABLE - if (!XTrap_CheckInit()) - return false; -#endif if (m_pySystem.IsUseDefaultIME()) { diff --git a/src/UserInterface/PythonApplicationEvent.cpp b/src/UserInterface/PythonApplicationEvent.cpp index 88e5d5c..afe263b 100644 --- a/src/UserInterface/PythonApplicationEvent.cpp +++ b/src/UserInterface/PythonApplicationEvent.cpp @@ -81,7 +81,6 @@ void CPythonApplication::OnMouseMove(int x, int y) y = Point.y; ClientToScreen(m_hWnd, &Point); - // 2004.07.26.myevan.안철수HackShield와 충돌 SetCursorPos(Point.x, Point.y); } diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp index 4788d01..67bffde 100644 --- a/src/UserInterface/PythonNetworkStream.cpp +++ b/src/UserInterface/PythonNetworkStream.cpp @@ -177,9 +177,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap Set(HEADER_GC_DIG_MOTION, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCDigMotion), STATIC_SIZE_PACKET)); Set(HEADER_GC_DAMAGE_INFO, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCDamageInfo), STATIC_SIZE_PACKET)); - Set(HEADER_GC_HS_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketHSCheck), STATIC_SIZE_PACKET)); - Set(HEADER_GC_XTRAP_CS1_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketXTrapCSVerify), STATIC_SIZE_PACKET)); - Set(HEADER_GC_HYBRIDCRYPT_KEYS, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCHybridCryptKeys), DYNAMIC_SIZE_PACKET)); Set(HEADER_GC_HYBRIDCRYPT_SDB, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCHybridSDB), DYNAMIC_SIZE_PACKET)); Set(HEADER_GC_SPECIFIC_EFFECT, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCSpecificEffect), STATIC_SIZE_PACKET)); diff --git a/src/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h index 057c467..335c689 100644 --- a/src/UserInterface/PythonNetworkStream.h +++ b/src/UserInterface/PythonNetworkStream.h @@ -559,10 +559,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton - - #pragma comment(lib, "XTrap4Client_mt.lib") - #pragma comment(lib, "XTrap4Client_ClientPart_mt.lib") - #pragma comment(lib, "XTrap4Client_ServerPart_mt.lib") - #pragma comment(lib, "XTrap_Unipher_mt.lib") - //#pragma comment(lib, "XTrap4Launcher_mt.lib" ) - -bool XTrap_Init() -{ - //XTrap_L_Patch( XTRAP_PATCH_ARG, NULL, 60 ); - XTrap_C_Start( XTRAP_PATCH_ARG, NULL ); - return true; -} - -bool XTrap_CheckInit() -{ - XTrap_C_KeepAlive(); - return true; -} - -void XTrap_PollEvent() -{ - static DWORD dwLastTick = 0; - DWORD dwCurrentTick = ::GetTickCount(); - - if( (dwCurrentTick - dwLastTick) > 2000 ) - { - XTrap_C_CallbackAlive(2000); - dwLastTick = dwCurrentTick; - } -} - -void XTrap_ValidateCheckStream( LPVOID PacketBufferIn, LPVOID PacketBufferOut ) -{ - XTrap_CS_Step2( PacketBufferIn, PacketBufferOut, XTRAP_PROTECT_PE | XTRAP_PROTECT_TEXT | XTRAP_PROTECT_EXCEPT_VIRUS ); -} - - -void XTrap_SetUserInfo(LPCSTR szUserID, LPCSTR szServerName, LPCSTR szCharacterName, LPCSTR szCharacterClass, SOCKET hSocket) -{ - XTrap_C_SetUserInfoEx( szUserID, szServerName, szCharacterName, szCharacterClass, NULL, hSocket ); -} - -#else - -bool XTrap_Init() -{ - return true; -} - -bool XTrap_CheckInit() -{ - return true; -} - -void XTrap_PollEvent() -{ -} - -void XTrap_SetUserInfo(LPCSTR szUserID, LPCSTR szServerName, LPCSTR szCharacterName, LPCSTR szCharacterClass, SOCKET hSocket) -{ - -} - -void XTrap_ValidateCheckStream( LPVOID PacketBufferIn, LPVOID PacketBufferOut ) -{ - -} - -#endif /* XTRAP_CLIENT_ENABLE */ diff --git a/src/UserInterface/WiseLogicXTrap.h b/src/UserInterface/WiseLogicXTrap.h deleted file mode 100644 index e699f23..0000000 --- a/src/UserInterface/WiseLogicXTrap.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -bool XTrap_Init(); -bool XTrap_CheckInit(); -void XTrap_PollEvent(); -void XTrap_ValidateCheckStream( LPVOID PacketBufferIn, LPVOID PacketBufferOut ); -void XTrap_SetUserInfo(LPCSTR szUserID, LPCSTR szServerName, LPCSTR szCharacterName, LPCSTR szCharacterClass, SOCKET hSocket); -