Refactoring

WeChatFerry/spy/chatroom_mgmt.cpp

@@ -1,4 +1,4 @@
-#include "framework.h"
+#include "framework.h"
 #include <sstream>
 #include <vector>
 
@@ -25,23 +25,17 @@ int AddChatroomMember(string roomid, string wxids)
     DWORD addRoomMemberCall3 = g_WeChatWinDllAddr + g_WxCalls.arm.call3;
 
     DWORD temp       = 0;
-    WxString_t txtRoomid = { 0 };
     wstring wsRoomid = String2Wstring(roomid);
-    txtRoomid.text       = (wchar_t *)wsRoomid.c_str();
+    WxString txtRoomid(wsRoomid);
-    txtRoomid.size       = wsRoomid.size();
-    txtRoomid.capacity   = wsRoomid.capacity();
 
     vector<wstring> vMembers;
-    vector<WxString_t> vTxtMembers;
+    vector<WxString> vTxtMembers;
     wstringstream wss(String2Wstring(wxids));
     while (wss.good()) {
         wstring wstr;
         getline(wss, wstr, L',');
         vMembers.push_back(wstr);
-        WxString_t txtMember = { 0 };
+        WxString txtMember(vMembers.back());
-        txtMember.text       = (wchar_t *)vMembers.back().c_str();
-        txtMember.size       = vMembers.back().size();
-        txtMember.capacity   = vMembers.back().capacity();
         vTxtMembers.push_back(txtMember);
     }
 
@@ -85,23 +79,17 @@ int DelChatroomMember(string roomid, string wxids)
     DWORD delRoomMemberCall3 = g_WeChatWinDllAddr + g_WxCalls.drm.call3;
 
     DWORD temp       = 0;
-    WxString_t txtRoomid = { 0 };
     wstring wsRoomid = String2Wstring(roomid);
-    txtRoomid.text       = (wchar_t *)wsRoomid.c_str();
+    WxString txtRoomid(wsRoomid);
-    txtRoomid.size       = wsRoomid.size();
-    txtRoomid.capacity   = wsRoomid.capacity();
 
     vector<wstring> vMembers;
-    vector<WxString_t> vTxtMembers;
+    vector<WxString> vTxtMembers;
     wstringstream wss(String2Wstring(wxids));
     while (wss.good()) {
         wstring wstr;
         getline(wss, wstr, L',');
         vMembers.push_back(wstr);
-        WxString_t txtMember = { 0 };
+        WxString txtMember(vMembers.back());
-        txtMember.text       = (wchar_t *)vMembers.back().c_str();
-        txtMember.size       = vMembers.back().size();
-        txtMember.capacity   = vMembers.back().capacity();
         vTxtMembers.push_back(txtMember);
     }
 

WeChatFerry/spy/contact_mgmt.cpp

@@ -5,6 +5,7 @@
 #include "log.h"
 #include "util.h"
 
+using namespace std;
 extern WxCalls_t g_WxCalls;
 extern DWORD g_WeChatWinDllAddr;
 
@@ -90,7 +91,7 @@ vector<RpcContact_t> GetContacts()
     return contacts;
 }
 
-int AcceptNewFriend(std::string v3, std::string v4, int scene)
+int AcceptNewFriend(string v3, string v4, int scene)
 {
     int success = 0;
 
@@ -103,18 +104,11 @@ int AcceptNewFriend(std::string v3, std::string v4, int scene)
     char nullbuffer[0x3CC] = { 0 };
 
     LOG_DEBUG("\nv3: {}\nv4: {}\nscene: {}", v3, v4, scene);
-    WxString_t wxV3   = { 0 };
-    WxString_t wxV4   = { 0 };
-    std::wstring wsV3 = String2Wstring(v3);
-    std::wstring wsV4 = String2Wstring(v4);
 
-    wxV3.text     = (wchar_t *)wsV3.c_str();
+    wstring wsV3 = String2Wstring(v3);
-    wxV3.size     = wsV3.size();
+    wstring wsV4 = String2Wstring(v4);
-    wxV3.capacity = wsV3.capacity();
+    WxString wxV3(wsV3);
-
+    WxString wxV4(wsV4);
-    wxV4.text     = (wchar_t *)wsV4.c_str();
-    wxV4.size     = wsV4.size();
-    wxV4.capacity = wsV4.capacity();
 
     __asm {
         pushad;

WeChatFerry/spy/funcs.cpp

@@ -260,16 +260,8 @@ string DownloadAttach(uint64_t id, string thumb, string extra)
     wstring wsSavePath  = String2Wstring(save_path);
     wstring wsThumbPath = String2Wstring(thumb_path);
 
-    WxString_t wxSavePath  = { 0 };
+    WxString wxSavePath(wsSavePath);
-    WxString_t wxThumbPath = { 0 };
+    WxString wxThumbPath(wsThumbPath);
-
-    wxSavePath.text     = (wchar_t *)wsSavePath.c_str();
-    wxSavePath.size     = wsSavePath.size();
-    wxSavePath.capacity = wsSavePath.capacity();
-
-    wxThumbPath.text     = (wchar_t *)wsThumbPath.c_str();
-    wxThumbPath.size     = wsThumbPath.size();
-    wxThumbPath.capacity = wsThumbPath.capacity();
 
     int temp = 1;
     memcpy(&buff[0x19C], &wxThumbPath, sizeof(wxThumbPath));

WeChatFerry/spy/receive_transfer.cpp

@@ -17,22 +17,12 @@ int ReceiveTransfer(string wxid, string transferid, string transactionid)
 
     char payInfo[0x134] = { 0 };
     wstring wsWxid      = String2Wstring(wxid);
-    WxString_t wxWxid   = { 0 };
-    wxWxid.text         = (wchar_t *)wsWxid.c_str();
-    wxWxid.size         = wsWxid.size();
-    wxWxid.capacity     = wsWxid.capacity();
-
     wstring wsTfid      = String2Wstring(transferid);
-    WxString_t wxTfid = { 0 };
-    wxTfid.text       = (wchar_t *)wsTfid.c_str();
-    wxTfid.size       = wsTfid.size();
-    wxTfid.capacity   = wsTfid.capacity();
-
     wstring wsTaid      = String2Wstring(transactionid);
-    WxString_t wxTaid = { 0 };
+
-    wxTaid.text       = (wchar_t *)wsTaid.c_str();
+    WxString wxWxid(wsWxid);
-    wxTaid.size       = wsTaid.size();
+    WxString wxTfid(wsTfid);
-    wxTaid.capacity   = wsTaid.capacity();
+    WxString wxTaid(wsTaid);
 
     LOG_DEBUG("Receiving transfer, from: {}, transferid: {}, transactionid: {}", wxid, transferid, transactionid);
     __asm {

WeChatFerry/spy/send_msg.cpp

@@ -15,8 +15,6 @@ void SendTextMessage(string wxid, string msg, string atWxids)
 {
     int success        = 0;
     char buffer[0x2D8] = { 0 };
-    WxString_t wxMsg   = { 0 };
-    WxString_t wxWxid  = { 0 };
 
     // 发送消息Call地址 = 微信基址 + 偏移
     DWORD sendCall1 = g_WeChatWinDllAddr + g_WxCalls.sendText.call1;
@@ -25,16 +23,10 @@ void SendTextMessage(string wxid, string msg, string atWxids)
 
     wstring wsWxid = String2Wstring(wxid);
     wstring wsMsg  = String2Wstring(msg);
+    WxString wxMsg(wsMsg);
+    WxString wxWxid(wsWxid);
 
-    wxMsg.text     = (wchar_t *)wsMsg.c_str();
+    vector<WxString> vWxAtWxids;
-    wxMsg.size     = wsMsg.size();
-    wxMsg.capacity = wsMsg.capacity();
-
-    wxWxid.text     = (wchar_t *)wsWxid.c_str();
-    wxWxid.size     = wsWxid.size();
-    wxWxid.capacity = wsWxid.capacity();
-
-    vector<WxString_t> vTxtAtWxids;
     if (!atWxids.empty()) {
         vector<wstring> vAtWxids;
         wstringstream wss(String2Wstring(atWxids));
@@ -42,11 +34,8 @@ void SendTextMessage(string wxid, string msg, string atWxids)
             wstring wstr;
             getline(wss, wstr, L',');
             vAtWxids.push_back(wstr);
-            WxString_t txtAtWxid = { 0 };
+            WxString wxAtWxid(vAtWxids.back());
-            txtAtWxid.text       = (wchar_t *)vAtWxids.back().c_str();
+            vWxAtWxids.push_back(wxAtWxid);
-            txtAtWxid.size       = vAtWxids.back().size();
-            txtAtWxid.capacity   = vAtWxids.back().capacity();
-            vTxtAtWxids.push_back(txtAtWxid);
         }
     }
 
@@ -58,7 +47,7 @@ void SendTextMessage(string wxid, string msg, string atWxids)
         push 0x0;
         push 0x0;
         push 0x1;
-        lea eax, vTxtAtWxids;
+        lea eax, vWxAtWxids;
         push eax;
         lea eax, wxMsg;
         push eax;
@@ -81,20 +70,13 @@ void SendImageMessage(string wxid, string path)
     int success     = 0;
     DWORD tmpEAX    = 0;
     char buf[0x2D8] = { 0 };
-    WxString_t imgWxid    = { 0 };
-    WxString_t imgPath    = { 0 };
-    WxString_t nullbuffer = { 0 };
 
     wstring wsWxid = String2Wstring(wxid);
-    wstring wspath = String2Wstring(path);
+    wstring wsPath = String2Wstring(path);
 
-    imgWxid.text     = (wchar_t *)wsWxid.c_str();
+    WxString wxWxid(wsWxid);
-    imgWxid.size     = wsWxid.size();
+    WxString wxPath(wsPath);
-    imgWxid.capacity = wsWxid.capacity();
+    WxString nullbuffer;
-
-    imgPath.text     = (wchar_t *)wspath.c_str();
-    imgPath.size     = wspath.size();
-    imgPath.capacity = wspath.capacity();
 
     // 发送图片Call地址 = 微信基址 + 偏移
     DWORD sendCall1 = g_WeChatWinDllAddr + g_WxCalls.sendImg.call1;
@@ -109,11 +91,11 @@ void SendImageMessage(string wxid, string path)
         mov        tmpEAX,eax;
         lea        eax,nullbuffer;
         mov        ecx,esp;
-        lea        edi,imgPath;
+        lea        edi,wxPath;
         push       eax;
         call       sendCall2;
         mov        ecx,dword ptr [tmpEAX];
-        lea        eax,imgWxid;
+        lea        eax,wxWxid;
         push       edi;
         push       eax;
         lea        eax,buf;
@@ -134,20 +116,13 @@ void SendFileMessage(string wxid, string path)
     int success        = 0;
     DWORD tmpEAX       = 0;
     char buffer[0x2D8] = { 0 };
-    WxString_t fileWxid   = { 0 };
-    WxString_t filePath   = { 0 };
-    WxString_t nullbuffer = { 0 };
 
     wstring wsWxid = String2Wstring(wxid);
-    wstring wspath = String2Wstring(path);
+    wstring wsPath = String2Wstring(path);
 
-    fileWxid.text     = (wchar_t *)wsWxid.c_str();
+    WxString wxWxid(wsWxid);
-    fileWxid.size     = wsWxid.size();
+    WxString wxPath(wsPath);
-    fileWxid.capacity = wsWxid.capacity();
+    WxString nullbuffer;
-
-    filePath.text     = (wchar_t *)wspath.c_str();
-    filePath.size     = wspath.size();
-    filePath.capacity = wspath.capacity();
 
     // 发送文件Call地址 = 微信基址 + 偏移
     DWORD sendCall1 = g_WeChatWinDllAddr + g_WxCalls.sendFile.call1;
@@ -174,12 +149,12 @@ void SendFileMessage(string wxid, string path)
         mov dword ptr[edi + 0xc], 0;
         mov dword ptr[edi + 0x10], 0;
         sub esp, 0x14;
-        lea eax, filePath;
+        lea eax, wxPath;
         mov ecx, esp;
         push eax;
         call sendCall2;
         sub esp, 0x14;
-        lea eax, fileWxid;
+        lea eax, wxWxid;
         mov ecx, esp;
         push eax;
         call sendCall2;
@@ -211,33 +186,20 @@ void SendXmlMessage(string receiver, string xml, string path, int type)
 
     char buffer[0xFF0] = { 0 };
     char nullBuf[0x1C] = { 0 };
-    WxString_t wxReceiver = { 0 };
-    WxString_t wxXml      = { 0 };
-    WxString_t wxPath     = { 0 };
-    WxString_t wxNull     = { 0 };
-    WxString_t wxSender   = { 0 };
 
     wstring wsSender   = String2Wstring(GetSelfWxid());
     wstring wsReceiver = String2Wstring(receiver);
     wstring wsXml      = String2Wstring(xml);
 
-    wxReceiver.text     = (wchar_t *)wsReceiver.c_str();
+    WxString wxPath;
-    wxReceiver.size     = wsReceiver.size();
+    WxString wxNull;
-    wxReceiver.capacity = wsReceiver.capacity();
+    WxString wxXml(wsXml);
-
+    WxString wxSender(wsSender);
-    wxXml.text     = (wchar_t *)wsXml.c_str();
+    WxString wxReceiver(wsReceiver);
-    wxXml.size     = wsXml.size();
-    wxXml.capacity = wsXml.capacity();
-
-    wxSender.text     = (wchar_t *)wsSender.c_str();
-    wxSender.size     = wsSender.size();
-    wxSender.capacity = wsSender.capacity();
 
     if (!path.empty()) {
         wstring wsPath = String2Wstring(path);
-        wxPath.text     = (wchar_t *)wsPath.c_str();
+        wxPath         = WxString(wsPath);
-        wxPath.size     = wsPath.size();
-        wxPath.capacity = wsPath.capacity();
     }
 
     DWORD sendtype = type;
@@ -282,20 +244,12 @@ void SendEmotionMessage(string wxid, string path)
     }
 
     char buffer[0x1C] = { 0 };
-    WxString_t emoWxid    = { 0 };
-    WxString_t emoPath    = { 0 };
-    WxString_t nullbuffer = { 0 };
-
     wstring wsWxid    = String2Wstring(wxid);
-    wstring wspath = String2Wstring(path);
+    wstring wsPath    = String2Wstring(path);
 
-    emoWxid.text     = (wchar_t *)wsWxid.c_str();
+    WxString wxWxid(wsWxid);
-    emoWxid.size     = wsWxid.size();
+    WxString wxPath(wsPath);
-    emoWxid.capacity = wsWxid.capacity();
+    WxString nullbuffer;
-
-    emoPath.text     = (wchar_t *)wspath.c_str();
-    emoPath.size     = wspath.size();
-    emoPath.capacity = wspath.capacity();
 
     // 发送文件Call地址 = 微信基址 + 偏移
     DWORD sendCall1 = g_WeChatWinDllAddr + g_WxCalls.sendEmo.call1;
@@ -317,7 +271,7 @@ void SendEmotionMessage(string wxid, string path)
         mov dword ptr [esi+0xC], 0x0;
         mov dword ptr [esi+0x10], 0x0;
         push 0x2;
-        lea eax, emoWxid;
+        lea eax, wxWxid;
         sub esp, 0x14;
         mov ecx, esp;
         push eax;
@@ -331,7 +285,7 @@ void SendEmotionMessage(string wxid, string path)
         mov dword ptr [esi+0x10], 0x0;
         sub esp, 0x14;
         mov ecx, esp;
-        lea eax, emoPath;
+        lea eax, wxPath;
         push eax;
         call sendCall1;
         mov ecx, ebx;

WeChatFerry/spy/spy_types.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "framework.h"
+#include <string>
 
 typedef struct UserInfoCall {
     DWORD wxid;
@@ -102,7 +103,7 @@ typedef struct Pyq {
     DWORD step;
 } Pyq_t;
 
-typedef struct DlAttach{
+typedef struct DlAttach {
     DWORD call1;
     DWORD call2;
     DWORD call3;
@@ -130,9 +131,27 @@ typedef struct WxCalls {
     DlAttach_t da;       // 下载资源（图片、文件、视频）
 } WxCalls_t;
 
-typedef struct WxString {
+struct WxString {
-    wchar_t *text;
+    const wchar_t *wptr;
     DWORD size;
     DWORD capacity;
-    char fill[8];
+    const char *ptr;
-} WxString_t;
+    DWORD clen;
+    WxString()
+    {
+        wptr     = NULL;
+        size     = 0;
+        capacity = 0;
+        ptr      = NULL;
+        clen     = 0;
+    }
+
+    WxString(std::wstring &ws)
+    {
+        wptr     = ws.c_str();
+        size     = ws.size();
+        capacity = ws.capacity();
+        ptr      = NULL;
+        clen     = 0;
+    }
+};