feat: replace hook library to support arm64

Related issues: #37 #52 #88.

Co-authored-by: Ritchie1108 <Ritchie1108@gmail.com>
Co-authored-by: YorkWaugh <67750590+YorkWaugh@users.noreply.github.com>

.github/workflows/build.yml

@@ -10,6 +10,7 @@ jobs:
         include: [
             { name: Chrome++_x86, arch: x86 },
             { name: Chrome++_x64, arch: x64 },
+            { name: Chrome++_arm64, arch: arm64 }
         ]
 
     name: ${{ matrix.name }}

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "minhook"]
-	path = minhook
-	url = https://github.com/TsudaKageyu/minhook
 [submodule "mini_gzip"]
 	path = mini_gzip
 	url = https://github.com/Bush2021/mini_gzip
+[submodule "detours"]
+	path = detours
+	url = https://github.com/microsoft/Detours

VC-LTL5.lua

@@ -33,6 +33,8 @@ target("VC-LTL-5")
             archpath = "Win32"
         elseif arch=="x64" then
             archpath = "x64"
+        elseif arch=="arm64" then
+            archpath = "arm64"
         end
         cprint("${color.warning}Platform : %s", archpath)
         local libpath = VC_LTL_Root .. [[TargetPlatform\]] .. WindowsTargetPlatformMinVersion..[[\lib\]] .. archpath .. ";"
@@ -41,4 +43,4 @@ target("VC-LTL-5")
 
         -- print(runenvs.INCLUDE)
         -- print(runenvs.LIB)
-    end)
+    end)

src/appid.h

@@ -5,10 +5,7 @@
 #include <propvarutil.h>
 #include <shobjidl.h>
 
-typedef HRESULT(WINAPI* pPSStringFromPropertyKey)(REFPROPERTYKEY pkey,
-                                                  LPWSTR psz,
-                                                  UINT cch);
-pPSStringFromPropertyKey RawPSStringFromPropertyKey = nullptr;
+auto RawPSStringFromPropertyKey = PSStringFromPropertyKey;
 
 HRESULT WINAPI MyPSStringFromPropertyKey(REFPROPERTYKEY pkey,
                                          LPWSTR psz,
@@ -24,17 +21,12 @@ HRESULT WINAPI MyPSStringFromPropertyKey(REFPROPERTYKEY pkey,
 }
 
 void SetAppId() {
-  HMODULE Propsys = LoadLibrary(L"Propsys.dll");
-
-  PBYTE PSStringFromPropertyKey =
-      (PBYTE)GetProcAddress(Propsys, "PSStringFromPropertyKey");
-  MH_STATUS status =
-      MH_CreateHook(PSStringFromPropertyKey, MyPSStringFromPropertyKey,
-                    (LPVOID*)&RawPSStringFromPropertyKey);
-  if (status == MH_OK) {
-    MH_EnableHook(PSStringFromPropertyKey);
-  } else {
-    DebugLog(L"MH_CreateHook PSStringFromPropertyKey failed:%d", status);
+  DetourTransactionBegin();
+  DetourUpdateThread(GetCurrentThread());
+  DetourAttach((LPVOID*)&RawPSStringFromPropertyKey, MyPSStringFromPropertyKey);
+  auto status = DetourTransactionCommit();
+  if (status != NO_ERROR) {
+    DebugLog(L"SetAppId failed %d", status);
   }
 }
 

src/chrome++.cpp

@@ -6,7 +6,7 @@ HMODULE hInstance;
 
 #define MAGIC_CODE 0x1603ABD9
 
-#include "MinHook.h"
+#include "detours.h"
 #include "version.h"
 
 #include "hijack.h"
@@ -68,36 +68,28 @@ void InstallLoader() {
   MODULEINFO mi;
   GetModuleInformation(GetCurrentProcess(), GetModuleHandle(nullptr), &mi,
                        sizeof(MODULEINFO));
-  PBYTE entry = (PBYTE)mi.EntryPoint;
-
-  // Jump from the original entry to the loader.
-  MH_STATUS status = MH_CreateHook(entry, Loader, (LPVOID*)&ExeMain);
-  if (status == MH_OK) {
-    MH_EnableHook(entry);
-  } else {
-    DebugLog(L"MH_CreateHook InstallLoader failed:%d", status);
+  ExeMain = (Startup)mi.EntryPoint;
+
+  DetourTransactionBegin();
+  DetourUpdateThread(GetCurrentThread());
+  DetourAttach((LPVOID*)&ExeMain, Loader);
+  auto status = DetourTransactionCommit();
+  if (status != NO_ERROR) {
+    DebugLog(L"InstallLoader failed: %d", status);
   }
 }
-#define EXTERNC extern "C"
 
-//
-EXTERNC __declspec(dllexport) void portable() {}
+__declspec(dllexport) void portable() {}
 
-EXTERNC BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID pv) {
+BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID pv) {
   if (dwReason == DLL_PROCESS_ATTACH) {
     DisableThreadLibraryCalls(hModule);
     hInstance = hModule;
 
     // Maintain the original function of system DLLs.
     LoadSysDll(hModule);
 
-    // Install the loader after successfully initializing MinHook.
-    MH_STATUS status = MH_Initialize();
-    if (status == MH_OK) {
-      InstallLoader();
-    } else {
-      DebugLog(L"MH_Initialize failed:%d", status);
-    }
+    InstallLoader();
   }
   return TRUE;
 }