Refactoring

2024-04-16 19:42:40 +08:00
parent b8393e1e74
commit 651ab8959d
17 changed files with 100 additions and 359 deletions
@@ -164,7 +164,7 @@
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include</AdditionalIncludeDirectories>
      <PrecompiledHeaderOutputFile />
      <SupportJustMyCode>true</SupportJustMyCode>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -185,15 +185,15 @@
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClInclude Include="..\spy\log.h" />
-    <ClInclude Include="..\spy\util.h" />
+    <ClInclude Include="..\com\log.h" />
+    <ClInclude Include="..\com\util.h" />
    <ClInclude Include="framework.h" />
    <ClInclude Include="injector.h" />
    <ClInclude Include="sdk.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\spy\log.cpp" />
-    <ClCompile Include="..\spy\util.cpp" />
+    <ClCompile Include="..\com\log.cpp" />
+    <ClCompile Include="..\com\util.cpp" />
    <ClCompile Include="dllmain.cpp" />
    <ClCompile Include="injector.cpp" />
    <ClCompile Include="sdk.cpp" />
@@ -21,32 +21,32 @@
    <ClInclude Include="sdk.h">
      <Filter>头文件</Filter>
    </ClInclude>
-    <ClInclude Include="..\spy\util.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\spy\log.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
    <ClInclude Include="injector.h">
      <Filter>头文件</Filter>
    </ClInclude>
+    <ClInclude Include="..\com\log.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\com\util.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
-    <ClCompile Include="..\spy\log.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\spy\util.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
    <ClCompile Include="sdk.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="injector.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
+    <ClCompile Include="..\com\log.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\com\util.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="sdk.def">
@@ -1,22 +1,5 @@
 #include "injector.h"

-typedef BOOL(WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
-
-static void ShowErrorMessage(DWORD dwError, HANDLE hProcess)
-{
-    BOOL bIsWow64             = FALSE;
-    WCHAR szErrorMessage[256] = { 0 };
-    LPFN_ISWOW64PROCESS fnIsWow64Process
-        = (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "IsWow64Process");
-    if (fnIsWow64Process != NULL && fnIsWow64Process(hProcess, &bIsWow64)) {
-        if (bIsWow64) {
-            wsprintf(szErrorMessage, L"LoadLibrary 调用失败，请检查应用版本/位数。错误码: %lu", dwError);
-        }
-    }
-    wsprintf(szErrorMessage, L"LoadLibrary 调用失败。错误码: %lu", dwError);
-    MessageBox(NULL, szErrorMessage, L"InjectDll", 0);
-}
-
 HANDLE InjectDll(DWORD pid, LPCWSTR dllPath, HMODULE *injectedBase)
 {
    HANDLE hThread;
@@ -39,9 +22,20 @@ HANDLE InjectDll(DWORD pid, LPCWSTR dllPath, HMODULE *injectedBase)
    WriteProcessMemory(hProcess, pRemoteAddress, dllPath, cszDLL, NULL);

    // 3. 创建一个远程线程，让目标进程调用 LoadLibrary
-    hThread = CreateRemoteThread(hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)LoadLibrary, pRemoteAddress, 0, NULL);
+    HMODULE k32 = GetModuleHandle(L"kernel32.dll");
+    if (k32 == NULL) {
+        MessageBox(NULL, L"获取 kernel32 失败", L"InjectDll", 0);
+        return NULL;
+    }
+
+    FARPROC libAddr = GetProcAddress(k32, "LoadLibraryW");
+    if (!libAddr) {
+        MessageBox(NULL, L"获取 LoadLibrary 失败", L"InjectDll", 0);
+        return NULL;
+    }
+
+    hThread = CreateRemoteThread(hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)libAddr, pRemoteAddress, 0, NULL);
    if (hThread == NULL) {
-        ShowErrorMessage(GetLastError(), hProcess);
        VirtualFreeEx(hProcess, pRemoteAddress, 0, MEM_RELEASE);
        CloseHandle(hProcess);

@@ -49,7 +43,7 @@ HANDLE InjectDll(DWORD pid, LPCWSTR dllPath, HMODULE *injectedBase)
    }

    WaitForSingleObject(hThread, -1);
-    GetExitCodeThread(hThread, (LPDWORD)injectedBase);
+    // GetExitCodeThread(hThread, (LPDWORD)injectedBase);
    CloseHandle(hThread);
    VirtualFreeEx(hProcess, pRemoteAddress, 0, MEM_RELEASE);
    // CloseHandle(hProcess); // Close when exit
@@ -62,7 +56,18 @@ bool EjectDll(HANDLE process, HMODULE dllBase)
    HANDLE hThread = NULL;

    // 使目标进程调用 FreeLibrary，卸载 DLL
-    hThread = CreateRemoteThread(process, NULL, 0, (LPTHREAD_START_ROUTINE)FreeLibrary, (LPVOID)dllBase, 0, NULL);
+    HMODULE k32 = GetModuleHandle(L"kernel32.dll");
+    if (k32 == NULL) {
+        MessageBox(NULL, L"获取 kernel32 失败", L"InjectDll", 0);
+        return NULL;
+    }
+
+    FARPROC libAddr = GetProcAddress(k32, "FreeLibrary");
+    if (!libAddr) {
+        MessageBox(NULL, L"获取 FreeLibrary 失败", L"InjectDll", 0);
+        return NULL;
+    }
+    hThread = CreateRemoteThread(process, NULL, 0, (LPTHREAD_START_ROUTINE)libAddr, (LPVOID)dllBase, 0, NULL);
    if (hThread == NULL) {
        MessageBox(NULL, L"FreeLibrary 调用失败!", L"EjectDll", 0);
        return false;
@@ -81,8 +86,8 @@ static void *GetFuncAddr(LPCWSTR dllPath, HMODULE dllBase, LPCSTR funcName)
        return NULL;
    }

-    void *absAddr = GetProcAddress(hLoaded, funcName);
-    DWORD offset  = (DWORD)absAddr - (DWORD)hLoaded;
+    void *absAddr  = GetProcAddress(hLoaded, funcName);
+    DWORD offset = (DWORD)absAddr - (DWORD)hLoaded;

    FreeLibrary(hLoaded);

@@ -102,7 +107,7 @@ bool CallDllFunc(HANDLE process, LPCWSTR dllPath, HMODULE dllBase, LPCSTR funcNa
    }
    WaitForSingleObject(hThread, INFINITE);
    if (ret != NULL) {
-        GetExitCodeThread(hThread, ret);
+        GetExitCodeThread(hThread, (LPDWORD)ret);
    }

    CloseHandle(hThread);
@@ -134,7 +139,7 @@ bool CallDllFuncEx(HANDLE process, LPCWSTR dllPath, HMODULE dllBase, LPCSTR func
    WaitForSingleObject(hThread, INFINITE);
    VirtualFree(pRemoteAddress, 0, MEM_RELEASE);
    if (ret != NULL) {
-        GetExitCodeThread(hThread, ret);
+        GetExitCodeThread(hThread, (LPDWORD)ret);
    }

    CloseHandle(hThread);
@@ -17,16 +17,16 @@ static WCHAR spyDllPath[MAX_PATH] = { 0 };

 static int GetDllPath(bool debug, wchar_t *dllPath)
 {
-    GetModuleFileName(GetModuleHandle(WECHATSDKDLL), spyDllPath, MAX_PATH);
-    PathRemoveFileSpec(spyDllPath);
+    GetModuleFileName(GetModuleHandle(WECHATSDKDLL), dllPath, MAX_PATH);
+    PathRemoveFileSpec(dllPath);
    if (debug) {
-        PathAppend(spyDllPath, WECHATINJECTDLL_DEBUG);
+        PathAppend(dllPath, WECHATINJECTDLL_DEBUG);
    } else {
-        PathAppend(spyDllPath, WECHATINJECTDLL);
+        PathAppend(dllPath, WECHATINJECTDLL);
    }

-    if (!PathFileExists(spyDllPath)) {
-        MessageBox(NULL, spyDllPath, L"文件不存在", 0);
+    if (!PathFileExists(dllPath)) {
+        MessageBox(NULL, dllPath, L"文件不存在", 0);
        return ERROR_FILE_NOT_FOUND;
    }

@@ -56,14 +56,17 @@ int WxInitSDK(bool debug, int port)
        return -1;
    }

+    return 0;
+
    PortPath_t pp = { 0 };
    pp.port       = port;
    sprintf_s(pp.path, MAX_PATH, "%s", std::filesystem::current_path().string().c_str());

-    if (!CallDllFuncEx(wcProcess, spyDllPath, spyBase, "InitSpy", (LPVOID)&pp, sizeof(PortPath_t), NULL)) {
-        MessageBox(NULL, L"初始化失败", L"WxInitSDK", 0);
-        return -1;
-    }
+    MessageBoxA(NULL, pp.path, "WxInitSDK", 0);
+    // if (!CallDllFuncEx(wcProcess, spyDllPath, spyBase, "InitSpy", (LPVOID)&pp, sizeof(PortPath_t), NULL)) {
+    //     MessageBox(NULL, L"初始化失败", L"WxInitSDK", 0);
+    //     return -1;
+    // }

 #ifdef WCF
    FILE *fd = fopen(WCF_LOCK, "wb");