chore: add in-house detours ffi bindings

.github/workflows/ci.yml

@@ -42,6 +42,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:
@@ -61,6 +62,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:
@@ -89,6 +91,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:
@@ -126,6 +129,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - run: |
           brew install rustup
@@ -161,6 +165,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:

.github/workflows/deny.yml

@@ -7,16 +7,16 @@ on:
   pull_request:
     types: [opened, synchronize]
     paths:
-      - "Cargo.lock"
-      - "deny.toml"
-      - ".github/workflows/deny.yml"
+      - 'Cargo.lock'
+      - 'deny.toml'
+      - '.github/workflows/deny.yml'
   push:
     branches:
       - main
     paths:
-      - "Cargo.lock"
-      - "deny.toml"
-      - ".github/workflows/deny.yml"
+      - 'Cargo.lock'
+      - 'deny.toml'
+      - '.github/workflows/deny.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -30,6 +30,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:

.github/workflows/release.yml

@@ -23,6 +23,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.2
         with:
@@ -93,6 +94,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: oxc-project/setup-node@fdbf0dfd334c4e6d56ceeb77d91c76339c2a0885 # v1.0.4
 
@@ -120,8 +122,8 @@ jobs:
       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version-file: .node-version
-          registry-url: "https://npm.pkg.github.com"
-          scope: "@voidzero-dev"
+          registry-url: 'https://npm.pkg.github.com'
+          scope: '@voidzero-dev'
           package-manager-cache: false
 
       - run: npm install -g npm@latest # For trusted publishing support

.github/workflows/zizmor.yml

@@ -7,13 +7,13 @@ on:
   pull_request:
     types: [opened, synchronize]
     paths:
-      - ".github/workflows/**"
+      - '.github/workflows/**'
   push:
     branches:
       - main
-      - "renovate/**"
+      - 'renovate/**'
     paths:
-      - ".github/workflows/**"
+      - '.github/workflows/**'
 
 jobs:
   zizmor:
@@ -26,6 +26,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: taiki-e/install-action@ae97ff9daf1cd2e216671a047d80ff48461e30bb # v2.49.1
         with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "crates/fspy_detours_sys/detours"]
+	path = crates/fspy_detours_sys/detours
+	url = https://github.com/microsoft/Detours

.typos.toml

@@ -5,4 +5,6 @@ PUNICODE = "PUNICODE"
 [files]
 extend-exclude = [
   "**/snap-tests/**/snap.txt",
+  "crates/fspy_detours_sys/detours",
+  "crates/fspy_detours_sys/src/generated_bindings.rs",
 ]

Cargo.toml

@@ -37,6 +37,7 @@ backon = "1.3.0"
 bincode = "2.0.1"
 brush-parser = "0.2.18"
 bstr = "1.12.0"
+cc = "1.2.39"
 clap = "4.5.40"
 color-eyre = "0.6.5"
 compact_str = "0.9.0"
@@ -48,6 +49,7 @@ directories = "6.0.0"
 edit = "0.1.5"
 flate2 = "1.0.35"
 fspy = { path = "crates/fspy" }
+fspy_detours_sys = { path = "crates/fspy_detours_sys" }
 fspy_preload_unix = { path = "crates/fspy_preload_unix", artifact = "cdylib" }
 fspy_preload_windows = { path = "crates/fspy_preload_windows", artifact = "cdylib" }
 fspy_seccomp_unotify = { path = "crates/fspy_seccomp_unotify" }
@@ -102,6 +104,7 @@ vite_path = { path = "crates/vite_path" }
 vite_str = { path = "crates/vite_str" }
 vite_task = { path = "crates/vite_task" }
 wax = "0.6.0"
+winapi = "0.3.9"
 
 napi = { version = "3.0.0", default-features = false, features = ["async", "error_anyhow"] }
 napi-build = "2"

crates/fspy/Cargo.toml

@@ -27,19 +27,17 @@ allocator-api2 = { version = "0.2.21", default-features = false, features = [
 tokio-seqpacket = "0.8.0"
 arrayvec = "0.7.6"
 nix = { version = "0.30.1", features = ["uio"] }
-fspy_seccomp_unotify = { workspace = true, features = ["supervisor"]}
-blink-alloc =  { version = "0.3.1", features = ["sync"]}
+fspy_seccomp_unotify = { workspace = true, features = ["supervisor"] }
+blink-alloc = { version = "0.3.1", features = ["sync"] }
 thread_local = "1.1.9"
 tokio = { version = "1.44.2", features = ["bytes"] }
-syscalls = { version = "0.6.18", default-features = false, features = ["std"]}
+syscalls = { version = "0.6.18", default-features = false, features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 fspy_shared_unix = { workspace = true }
 fspy_preload_unix = { workspace = true }
 nix = { version = "0.30.1", features = ["fs", "process", "socket", "feature"] }
-passfd = { git = "https://github.com/polachok/passfd", features = [
-    "async",
-] }
+passfd = { git = "https://github.com/polachok/passfd", features = ["async"] }
 memmap2 = "0.9.7"
 # asyncfd = "0.1.2"
 
@@ -53,14 +51,14 @@ const_format = { version = "0.2.34", features = ["fmt"] }
 
 
 [target.'cfg(target_os = "windows")'.dependencies]
-ms-detours = "4.0.5"
 winsafe = { version = "0.0.24", features = ["kernel"] }
-winapi = { version = "0.3.9", features = [
+winapi = { workspace = true, features = [
     "winbase",
     "securitybaseapi",
     "handleapi",
 ] }
 fspy_preload_windows = { workspace = true }
+fspy_detours_sys = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dev-dependencies]
 tempfile = "3.19.1"

crates/fspy/src/windows/mod.rs

@@ -10,12 +10,12 @@ use std::{
 
 use bincode::borrow_decode_from_slice;
 use const_format::formatcp;
+use fspy_detours_sys::{DetourCopyPayloadToProcess, DetourUpdateProcessWithDll};
 use fspy_shared::{
     ipc::{BINCODE_CONFIG, PathAccess},
     windows::{PAYLOAD_ID, Payload},
 };
 use futures_util::FutureExt;
-use ms_detours::{DetourCopyPayloadToProcess, DetourUpdateProcessWithDll};
 use tokio::{
     io::AsyncReadExt,
     net::windows::named_pipe::{PipeMode, ServerOptions},

crates/fspy_detours_sys/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "fspy_detours_sys"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+
+[build-dependencies]
+cc = { workspace = true }
+
+[dependencies]
+winapi = { workspace = true, features = ["minwindef", "libloaderapi", "processthreadsapi", "windef"] }
+
+[lints]
+workspace = true
+
+[dev-dependencies]
+bindgen = "0.72.1"

crates/fspy_detours_sys/README.md

@@ -0,0 +1,3 @@
+# fspy_detours_sys
+
+Raw FFI bindings to [Detours](https://github.com/Microsoft/Detours)

crates/fspy_detours_sys/build.rs

@@ -0,0 +1,18 @@
+fn main() {
+    if std::env::var_os("CARGO_CFG_TARGET_OS").unwrap() != "windows" {
+        return;
+    }
+    println!("cargo:rerun-if-changed=detours/src");
+    // https://github.com/Berrysoft/detours/blob/c9bc2ad6e9cd8f5f7b74cfa65365d61ecc45203f/detours-sys/build.rs
+    cc::Build::new()
+        .include("detours/src")
+        .define("WIN32_LEAN_AND_MEAN", "1")
+        .define("_WIN32_WINNT", "0x501")
+        .file("detours/src/detours.cpp")
+        .file("detours/src/modules.cpp")
+        .file("detours/src/disasm.cpp")
+        .file("detours/src/image.cpp")
+        .file("detours/src/creatwth.cpp")
+        .cpp(true)
+        .compile("detours");
+}