Refine RPC

SDK/sdk.cpp

@@ -15,8 +15,6 @@
 #include "sdk.h"
 #include "util.h"
 
-static HANDLE hEvent;
-static std::queue<RpcMessage_t> MsgQueue;
 static RPC_WSTR pszStringBinding = NULL;
 static std::function<int(WxMessage_t)> cbReceiveTextMsg;
 static const MsgTypesMap_t WxMsgTypes = MsgTypesMap_t { { 0x01, L"文字" },
@@ -121,37 +119,6 @@ int WxInitSDK()
     return ERROR_SUCCESS;
 }
 
-static unsigned int __stdcall waitForMsg(void *p)
-{
-    RpcMessage_t *rpcMsg;
-    while (true) {
-        // 中断式，兼顾及时性和CPU使用率
-        WaitForSingleObject(hEvent, INFINITE); // 等待消息
-        while (!MsgQueue.empty()) {
-            rpcMsg = (RpcMessage_t *)&MsgQueue.front();
-            WxMessage_t msg;
-            msg.id      = wstring(rpcMsg->id);
-            msg.self    = rpcMsg->self;
-            msg.type    = rpcMsg->type;
-            msg.source  = rpcMsg->source;
-            msg.xml     = wstring(rpcMsg->xml);
-            msg.wxId    = wstring(rpcMsg->wxId);
-            msg.roomId  = wstring(rpcMsg->roomId);
-            msg.content = wstring(rpcMsg->content);
-
-            try {
-                cbReceiveTextMsg(msg); // 调用接收消息回调
-            } catch (...) {
-                printf("callback error...\n");
-            }
-            MsgQueue.pop();
-        }
-        ResetEvent(hEvent);
-    }
-
-    return 0;
-}
-
 static unsigned int __stdcall innerWxSetTextMsgCb(void *p)
 {
     unsigned long ulCode = 0;
@@ -175,13 +142,6 @@ int WxSetTextMsgCb(const std::function<int(WxMessage_t)> &onMsg)
     if (onMsg) {
         HANDLE msgThread;
         cbReceiveTextMsg = onMsg;
-        hEvent           = CreateEvent(NULL, TRUE, FALSE, NULL);
-        msgThread        = (HANDLE)_beginthreadex(NULL, 0, waitForMsg, NULL, 0, NULL);
-        if (msgThread == NULL) {
-            printf("Failed to create message listening thread.\n");
-            return -2;
-        }
-        CloseHandle(msgThread);
 
         msgThread = (HANDLE)_beginthreadex(NULL, 0, innerWxSetTextMsgCb, NULL, 0, NULL);
         if (msgThread == NULL) {
@@ -197,10 +157,17 @@ int WxSetTextMsgCb(const std::function<int(WxMessage_t)> &onMsg)
     return -1;
 }
 
-int server_ReceiveMsg(RpcMessage_t *rpcMsg)
-{
-    MsgQueue.push(*rpcMsg); // 发送消息
-    SetEvent(hEvent);       // 发送消息通知
+int server_ReceiveMsg(RpcMessage_t rpcMsg)
+{
+    WxMessage_t msg;
+    GetRpcMessage(&msg, rpcMsg);
+    try {
+        cbReceiveTextMsg(msg); // 调用接收消息回调
+    }
+    catch (...) {
+        printf("callback error...\n");
+    }
+
     return 0;
 }
 

SDK/util.cpp

@@ -58,7 +58,7 @@ int GetWeChatWinDLLPath(wchar_t *path)
         // 微信从（大约）3.7开始，增加了一层版本目录: [3.7.0.29]
         PathRemoveFileSpec(path);
         _wfinddata_t findData;
-        wstring dir = wstring(path) + L"\\[*.*";
+        wstring dir     = wstring(path) + L"\\[*.*";
         intptr_t handle = _wfindfirst(dir.c_str(), &findData);
         if (handle == -1) { // 检查是否成功
             return -1;
@@ -66,7 +66,7 @@ int GetWeChatWinDLLPath(wchar_t *path)
         wstring dllPath = wstring(path) + L"\\" + findData.name;
         wcscpy_s(path, MAX_PATH, dllPath.c_str());
         PathAppend(path, WECHATWINDLL);
-    }
+    }
 
     return ret;
 }
@@ -133,17 +133,16 @@ int OpenWeChat(DWORD *pid)
 {
     int ret                = -1;
     STARTUPINFO si         = { sizeof(si) };
+    WCHAR Path[MAX_PATH]   = { 0 };
     PROCESS_INFORMATION pi = { 0 };
 
-    WCHAR Path[MAX_PATH] = { 0 };
-    ret                  = GetWeChatPath(Path);
+    ret = GetWeChatPath(Path);
     if (ERROR_SUCCESS != ret) {
         return ret;
     }
 
     if (!CreateProcess(NULL, Path, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi)) {
-        ret = GetLastError();
-        return ret;
+        return GetLastError();
     }
 
     CloseHandle(pi.hThread);
@@ -151,9 +150,7 @@ int OpenWeChat(DWORD *pid)
 
     *pid = pi.dwProcessId;
 
-    ret = ERROR_SUCCESS;
-
-    return ret;
+    return ERROR_SUCCESS;
 }
 
 int GetWstringByAddress(DWORD address, wchar_t *buffer, DWORD buffer_size)
@@ -170,6 +167,30 @@ int GetWstringByAddress(DWORD address, wchar_t *buffer, DWORD buffer_size)
     return strLength;
 }
 
+BSTR GetBstrByAddress(DWORD address) { return SysAllocStringLen(GET_WSTRING(address), GET_DWORD(address + 4)); }
+
+static wstring GetWstringFromBstr(BSTR p)
+{
+    wstring ret = L"";
+    if (p != nullptr) {
+        ret = wstring(p);
+        SysFreeString(p);
+    }
+    return ret;
+}
+
+void GetRpcMessage(WxMessage_t *wxMsg, RpcMessage_t rpcMsg)
+{
+    wxMsg->self    = rpcMsg.self;
+    wxMsg->type    = rpcMsg.type;
+    wxMsg->source  = rpcMsg.source;
+    wxMsg->id      = GetWstringFromBstr(rpcMsg.id);
+    wxMsg->xml     = GetWstringFromBstr(rpcMsg.xml);
+    wxMsg->wxId    = GetWstringFromBstr(rpcMsg.wxId);
+    wxMsg->roomId  = GetWstringFromBstr(rpcMsg.roomId);
+    wxMsg->content = GetWstringFromBstr(rpcMsg.content);
+}
+
 DWORD GetMemoryIntByAddress(HANDLE hProcess, DWORD address)
 {
     DWORD value = 0;

SDK/util.h

@@ -1,6 +1,9 @@
-#pragma once
+#pragma once
 
-#include <string>
+#include <string>
+
+#include "sdk.h"
+#include "rpc_h.h"
 
 #define WECHAREXE       L"WeChat.exe"
 #define WECHATWINDLL    L"WeChatWin.dll"
@@ -16,6 +19,8 @@ int GetWeChatPath(wchar_t *path);
 int GetWeChatWinDLLPath(wchar_t *path);
 int GetWeChatVersion(wchar_t *version);
 bool GetFileVersion(const wchar_t *filePath, wchar_t *version);
-int GetWstringByAddress(DWORD address, wchar_t *buffer, DWORD buffer_size);
+int GetWstringByAddress(DWORD address, wchar_t *buffer, DWORD buffer_size);
+BSTR GetBstrByAddress(DWORD address);
+void GetRpcMessage(WxMessage_t *wxMsg, RpcMessage_t rpcMsg);
 DWORD GetMemoryIntByAddress(HANDLE hProcess, DWORD address);
 std::wstring GetUnicodeInfoByAddress(HANDLE hProcess, DWORD address);