multi-wechat

WeChatFerry/launcher/launcher.vcxproj

@@ -146,6 +146,5 @@
     <Image Include="..\icon.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

WeChatFerry/sdk/SDK.vcxproj

@@ -186,6 +186,5 @@
     <None Include="sdk.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

WeChatFerry/sdk/sdk.cpp

@@ -33,7 +33,7 @@ static int GetDllPath(bool debug, wchar_t *dllPath)
     return 0;
 }
 
-int WxInitSDK(bool debug, int port)
+int WxInitSDK(bool debug, bool multi, int port, int inputPid)
 {
     int status  = 0;
     DWORD wcPid = 0;
@@ -43,13 +43,17 @@ int WxInitSDK(bool debug, int port)
         return status;
     }
 
-    status = OpenWeChat(&wcPid);
-    if (status != 0) {
-        MessageBox(NULL, L"打开微信失败", L"WxInitSDK", 0);
-        return status;
-    }
+    if(inputPid != 0) {
+        wcPid = inputPid;
+    } else {
+        status = OpenWeChat(&wcPid, multi);
+        if (status != 0) {
+            MessageBox(NULL, L"打开微信失败", L"WxInitSDK", 0);
+            return status;
+        }
 
-    Sleep(2000); // 等待微信打开
+        Sleep(2000); // 等待微信打开
+    }
     wcProcess = InjectDll(wcPid, spyDllPath, &spyBase);
     if (wcProcess == NULL) {
         MessageBox(NULL, L"注入失败", L"WxInitSDK", 0);

WeChatFerry/sdk/sdk.h

@@ -1,4 +1,4 @@
 #pragma once
 
-int WxInitSDK(bool debug, int port);
+int WxInitSDK(bool debug, bool multi, int port, int inputPid);
 int WxDestroySDK();

WeChatFerry/spy/Spy.vcxproj

@@ -176,7 +176,7 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry</Com
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>cd $(SolutionDir)rpc\proto
-$(SolutionDir)rpc\tool\protoc --nanopb_out=. wcf.proto</Command>
+$(SolutionDir)rpc\tool\protoc.exe --nanopb_out=. wcf.proto</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Generating PB files</Message>
@@ -273,6 +273,5 @@ $(SolutionDir)rpc\tool\protoc --nanopb_out=. wcf.proto</Command>
     <ResourceCompile Include="spy.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

WeChatFerry/spy/util.cpp

@@ -164,11 +164,13 @@ DWORD GetWeChatPid()
     return pid;
 }
 
-int OpenWeChat(DWORD *pid)
+int OpenWeChat(DWORD *pid, bool multi)
 {
-    *pid = GetWeChatPid();
-    if (*pid) {
-        return ERROR_SUCCESS;
+    if (!multi) {
+        *pid = GetWeChatPid();
+        if (*pid) {
+            return ERROR_SUCCESS;
+        }
     }
 
     int ret                = -1;

WeChatFerry/spy/util.h

@@ -21,7 +21,7 @@ typedef struct PortPath {
 } PortPath_t;
 
 DWORD GetWeChatPid();
-int OpenWeChat(DWORD *pid);
+int OpenWeChat(DWORD *pid, bool multi);
 int GetWeChatVersion(wchar_t *version);
 int GetWstringByAddress(DWORD address, wchar_t *buffer, DWORD buffer_size);
 DWORD GetMemoryIntByAddress(HANDLE hProcess, DWORD address);

WeChatFerry/wcf/main.cpp

@@ -6,24 +6,29 @@
 
 void help()
 {
-    printf("\nUsage: \n启动: wcf.exe start port [debug]\n关闭: wcf.exe stop\nport: 命令端口, 消息端口为命令端口+1\n");
+    printf("\nUsage: \n启动: wcf.exe start port [debug]\n关闭: wcf.exe stop\nport: 命令端口, 消息端口为命令端口+1\n指定微信pid启动: wcf.exe start port [pid]仅在你知道这是什么时候使用\n打开新的微信: wcf.exe start port [multi]\n");
 }
 
 int main(int argc, char *argv[])
 {
     int ret    = -1;
     bool debug = false;
+    bool multi = false;
 
     if ((argc < 2) || (argc > 4)) {
         help();
     } else if (argc == 4) {
         debug = (strcmp(argv[3], "debug") == 0);
+        multi = (strcmp(argv[3], "multi") == 0);
     }
 
     if (strcmp(argv[1], "start") == 0) {
         int port = strtol(argv[2], NULL, 10);
-
-        ret = WxInitSDK(debug, port);
+        int inputPid = 0;
+        if (!debug && !multi && argc == 4) {
+            inputPid = strtol(argv[3], NULL, 10);
+        }
+        ret = WxInitSDK(debug, multi, port, inputPid);
     } else if (strcmp(argv[1], "stop") == 0) {
         ret = WxDestroySDK();
     } else {

WeChatFerry/wcf/wcf.vcxproj

@@ -106,7 +106,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WCF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)sdk;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x86-windows-static\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)sdk;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x86-windows-static\include;D:\duguyifei\code\WX_AI\WeChatFerry\spdlog\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -168,6 +168,5 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry</Com
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>