seperate exe and dll crates

Author: StarrFox

.github/workflows/tests.yml

@@ -31,23 +31,23 @@ jobs:
       id: restore-cache-test
       uses: actions/cache/restore@v4
       with:
-        path: tests/manual/test_inject/target
-        key: ${{ runner.os }}-${{ hashFiles('tests/manual/test_inject/src/**') }}
+        path: target
+        key: ${{ runner.os }}-${{ hashFiles('tests/manual/test_binaries/**') }}
 
     - name: Setup rust
       if: steps.restore-cache-test.outputs.cache-hit != 'true'
       uses: actions-rust-lang/setup-rust-toolchain@v1
 
     - name: Build test binaries
       if: steps.restore-cache-test.outputs.cache-hit != 'true'
-      run: cargo build --release --manifest-path tests/manual/test_inject/Cargo.toml
+      run: cargo build --release
 
     - name: Cache test binaries
       if: steps.restore-cache-test.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
-        path: tests/manual/test_inject/target
-        key: ${{ runner.os }}-${{ hashFiles('tests/manual/test_inject/src/**') }}
+        path: target
+        key: ${{ runner.os }}-${{ hashFiles('tests/manual/test_binaries/**') }}
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = [
-    "tests/manual/test_inject"
+    "tests/manual/test_binaries/test_inject",
+    "tests/manual/test_binaries/inject_target"
 ]
 resolver = "2"

Cargo.toml

@@ -47,13 +47,6 @@ format:
     black .
     alejandra .
 
-# build test dll
-build-test-dll:
-    if (!(Test-Path "tests/manual/test_inject/target/release/test_inject.dll")) { cargo build --release --manifest-path tests/manual/test_inject/Cargo.toml }
-
-# build test exe
-build-test-exe:
-    if (!(Test-Path "tests/manual/test_inject/target/release/inject_target.dll")) { cargo build --release --manifest-path tests/manual/test_inject/Cargo.toml --bin inject_target }
-
 # build test binaries
-build-test-bins: build-test-dll build-test-exe
+build-test-bins:
+    cargo build --release

justfile

@@ -0,0 +1,4 @@
+[package]
+name = "inject_target"
+version = "0.1.0"
+edition = "2021"

tests/manual/test_binaries/inject_target/Cargo.toml

@@ -0,0 +1,74 @@
+use std::str::FromStr;
+
+fn main() {
+    std::hint::black_box(add_five);
+    std::hint::black_box(create_player);
+    std::hint::black_box(uses_player);
+
+    let value = std::hint::black_box(add_five(60 * 1_000_000));
+
+    // This process just waits, so it can be injected into.
+    //std::thread::sleep(std::time::Duration::from_secs(60 * 5));
+    //std::thread::sleep(std::time::Duration::from_secs(60 * 1_000_000));
+    std::thread::sleep(std::time::Duration::from_secs(value as u64));
+}
+
+// static gives us a global address rather than in-lining the value
+#[used]
+static FIVE: u32 = 5;
+
+static mut MUTATED: u32 = 0;
+
+
+#[repr(C)]
+pub struct Pet {
+    name: String,
+    health: f32,
+}
+
+#[repr(C)]
+pub struct Player {
+    pub ammo: u32,
+    pub health: f32,
+    pub x: f32,
+    pub y: f32,
+    pub z: f32,
+    pub pet: Pet
+}
+
+impl Player {
+    #[no_mangle]
+    pub fn new() -> Player {
+        Player {
+            ammo: 100,
+            health: 100.0,
+            x: 250.0,
+            y: -250.0,
+            z: 0.0,
+            pet: Pet { name: String::from_str("Test").unwrap(), health: 200.0 }
+        }
+    }
+}
+
+// TODO: keep these from getting compiled away
+#[no_mangle]
+extern "C" fn add_five(value: u32) -> u32 {
+    value + FIVE
+}
+
+#[no_mangle]
+extern "C" fn create_player() -> () {
+    let player = Player::new();
+
+    uses_player(&player);
+}
+
+#[no_mangle]
+extern "C" fn uses_player(player: &Player) -> () {
+    // cmp with object offset
+    if player.health > 100.0 {
+        let new_value = add_five(player.ammo);
+
+        unsafe { MUTATED += new_value; }
+    }
+}

tests/manual/test_binaries/inject_target/src/main.rs

@@ -8,7 +8,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 windows = { version = "0.62.2", features = ["Win32_System_Console", "Win32_Foundation", "Win32_System_SystemServices"] }
-
-[[bin]]
-name = "inject_target"
-path = "src/bin/inject_target.rs"

tests/manual/test_inject/Cargo.lock …ual/test_binaries/test_inject/Cargo.locktests/manual/test_inject/Cargo.lock renamed to tests/manual/test_binaries/test_inject/Cargo.lock tests/manual/test_inject/Cargo.lock renamed to tests/manual/test_binaries/test_inject/Cargo.lock

@@ -8,11 +8,17 @@
 
 
 def test_dll_injection():
+    # there is probably a better way to get this
+    library_root = Path(__file__).parent.parent.parent
+
+    assert library_root.name == "memobj"
+    assert (library_root / "README.md").exists() is True
+
     dll_path = (
-        Path(__file__).parent / "test_inject/target/release/test_inject.dll"
+        library_root / "target/release/test_inject.dll"
     ).resolve()
     exe_path = (
-        Path(__file__).parent / "test_inject/target/release/inject_target.exe"
+        library_root / "target/release/inject_target.exe"
     ).resolve()
 
     if not dll_path.exists():