cyonjan/WeChatFerry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Hook/Unhook issue

Browse Source
This commit is contained in:
Changhua 2024-07-03 18:36:52 +08:00
parent a570c53d41
commit 38464e6450
1 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
WeChatFerry/spy/receive_msg.cpp
View File

@ -195,6 +195,33 @@ static void DispatchPyq(QWORD arg1, QWORD arg2, QWORD arg3)
} }
} }
static MH_STATUS InitializeHook()
{
if (isMH_Initialized) {
return MH_OK;
}
MH_STATUS status = MH_Initialize();
if (status == MH_OK) {
isMH_Initialized = true;
}
return status;
}
static MH_STATUS UninitializeHook()
{
if (!isMH_Initialized) {
return MH_OK;
}
if (gIsLogging || gIsListening || gIsListeningPyq) {
return MH_OK;
}
MH_STATUS status = MH_Uninitialize();
if (status == MH_OK) {
isMH_Initialized = false;
}
return status;
}
void EnableLog() void EnableLog()
{ {
MH_STATUS status = MH_UNKNOWN; MH_STATUS status = MH_UNKNOWN;
@ -204,13 +231,10 @@ void EnableLog()
} }
WxLog_t funcWxLog = (WxLog_t)(g_WeChatWinDllAddr + OS_WXLOG); WxLog_t funcWxLog = (WxLog_t)(g_WeChatWinDllAddr + OS_WXLOG);
if (!isMH_Initialized) { status = InitializeHook();
status = MH_Initialize(); if (status != MH_OK) {
if (status != MH_OK) { LOG_ERROR("MH_Initialize failed: {}", to_string(status));
LOG_ERROR("MH_Initialize failed: {}", to_string(status)); return;
return;
}
isMH_Initialized = true;
} }
status = MH_CreateHook(funcWxLog, &PrintWxLog, reinterpret_cast<LPVOID *>(&realWxLog)); status = MH_CreateHook(funcWxLog, &PrintWxLog, reinterpret_cast<LPVOID *>(&realWxLog));
@ -241,12 +265,11 @@ void DisableLog()
} }
gIsLogging = false; gIsLogging = false;
if (isMH_Initialized && !gIsLogging && !gIsListening && !gIsListeningPyq) {
status = MH_Uninitialize(); status = UninitializeHook();
if (status != MH_OK) { if (status != MH_OK) {
LOG_ERROR("MH_Uninitialize failed: {}", to_string(status)); LOG_ERROR("MH_Uninitialize failed: {}", to_string(status));
return; return;
}
} }
} }
@ -259,13 +282,10 @@ void ListenMessage()
} }
funcRecvMsg = (RecvMsg_t)(g_WeChatWinDllAddr + OS_RECV_MSG_CALL); funcRecvMsg = (RecvMsg_t)(g_WeChatWinDllAddr + OS_RECV_MSG_CALL);
if (!isMH_Initialized) { status = InitializeHook();
status = MH_Initialize(); if (status != MH_OK) {
if (status != MH_OK) { LOG_ERROR("MH_Initialize failed: {}", to_string(status));
LOG_ERROR("MH_Initialize failed: {}", to_string(status)); return;
return;
}
isMH_Initialized = true;
} }
status = MH_CreateHook(funcRecvMsg, &DispatchMsg, reinterpret_cast<LPVOID *>(&realRecvMsg)); status = MH_CreateHook(funcRecvMsg, &DispatchMsg, reinterpret_cast<LPVOID *>(&realRecvMsg));
@ -296,20 +316,13 @@ void UnListenMessage()
return; return;
} }
status = MH_Uninitialize(); gIsListening = false;
status = UninitializeHook();
if (status != MH_OK) { if (status != MH_OK) {
LOG_ERROR("MH_Uninitialize failed: {}", to_string(status)); LOG_ERROR("MH_Uninitialize failed: {}", to_string(status));
return; return;
} }
gIsListening = false;
if (isMH_Initialized && !gIsLogging && !gIsListening && !gIsListeningPyq) {
status = MH_Uninitialize();
if (status != MH_OK) {
LOG_ERROR("MH_Uninitialize failed: {}", to_string(status));
return;
}
}
} }
void ListenPyq() void ListenPyq()
@ -321,13 +334,10 @@ void ListenPyq()
} }
funcRecvPyq = (RecvPyq_t)(g_WeChatWinDllAddr + OS_PYQ_MSG_CALL); funcRecvPyq = (RecvPyq_t)(g_WeChatWinDllAddr + OS_PYQ_MSG_CALL);
if (!isMH_Initialized) { status = InitializeHook();
status = MH_Initialize(); if (status != MH_OK) {
if (status != MH_OK) { LOG_ERROR("MH_Initialize failed: {}", to_string(status));
LOG_ERROR("MH_Initialize failed: {}", to_string(status)); return;
return;
}
isMH_Initialized = true;
} }
status = MH_CreateHook(funcRecvPyq, &DispatchPyq, reinterpret_cast<LPVOID *>(&realRecvPyq)); status = MH_CreateHook(funcRecvPyq, &DispatchPyq, reinterpret_cast<LPVOID *>(&realRecvPyq));
@ -358,18 +368,11 @@ void UnListenPyq()
return; return;
} }
status = MH_Uninitialize(); gIsListeningPyq = false;
status = UninitializeHook();
if (status != MH_OK) { if (status != MH_OK) {
LOG_ERROR("MH_Uninitialize failed: {}", to_string(status)); LOG_ERROR("MH_Uninitialize failed: {}", to_string(status));
return; return;
} }
gIsListeningPyq = false;
if (isMH_Initialized && !gIsLogging && !gIsListening && !gIsListeningPyq) {
status = MH_Uninitialize();
if (status != MH_OK) {
LOG_ERROR("MH_Uninitialize failed: {}", to_string(status));
return;
}
}
} }