Fix new settlement wares mod (whaleoil)

Author: Trolldemorted

mod-fix-new-settlement-ware-production/Cargo.toml

@@ -10,10 +10,4 @@ name="fix_new_settlement_ware_production"
 [dependencies]
 log = { workspace = true }
 win_dbg_logger = { workspace = true }
-
-[dependencies.windows]
-version = "0.48"
-features = [
-    "Win32_Foundation",
-    "Win32_System_Memory",
-]
+hooklet = { workspace = true }

mod-fix-new-settlement-ware-production/src/ffi.rs

@@ -1,32 +1,33 @@
-use log::{debug, error};
-use windows::Win32::{
-    Foundation::{GetLastError, WIN32_ERROR},
-    System::Memory::{VirtualProtect, PAGE_EXECUTE_READWRITE, PAGE_PROTECTION_FLAGS},
-};
-
-const PATCH_ADDRESS: u32 = 0x00532FF3;
-
-#[no_mangle]
-pub unsafe extern "C" fn start() -> u32 {
-    let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
-    log::set_max_level(log::LevelFilter::Trace);
-    let patch_ptr: *mut u8 = PATCH_ADDRESS as _;
-
-    let mut old_flags: PAGE_PROTECTION_FLAGS = windows::Win32::System::Memory::PAGE_PROTECTION_FLAGS(0);
-    if !VirtualProtect(patch_ptr as _, 5, PAGE_EXECUTE_READWRITE, &mut old_flags).as_bool() {
-        let error: WIN32_ERROR = GetLastError();
-        error!("VirtualProtect PAGE_EXECUTE_READWRITE failed: {:?}", error);
-        return 1;
-    }
-
-    debug!("Patching comparison at {:#x}", PATCH_ADDRESS);
-    *patch_ptr = 0x04;
-
-    if !VirtualProtect(patch_ptr as _, 5, old_flags, &mut old_flags).as_bool() {
-        let error: WIN32_ERROR = GetLastError();
-        error!("VirtualProtect restore failed: {:?}", error);
-        return 2;
-    }
-
-    0
-}
+use hooklet::windows::x86::replace_slice_rwx;
+use log::{debug, error};
+
+const SUBTRACTION_PATCH_ADDRESS: u32 = 0x00532FF3;
+const WHALEOIL_PATCH_ADDRESS: u32 = 0x00533013;
+
+#[no_mangle]
+pub unsafe extern "C" fn start() -> u32 {
+    let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
+    log::set_max_level(log::LevelFilter::Trace);
+
+    debug!("Patching `sub` immediate value at {:#x}", SUBTRACTION_PATCH_ADDRESS);
+    let subtraction_patch = [4];
+    match replace_slice_rwx(SUBTRACTION_PATCH_ADDRESS, &subtraction_patch) {
+        Ok(_) => {}
+        Err(e) => {
+            error!("Failed to deploy patch: {:?}", e);
+            return 1;
+        }
+    }
+
+    debug!("Patching whaleoil `or` immediate value at {:#x}", SUBTRACTION_PATCH_ADDRESS);
+    let whaleoil_patch = 0x20002u32.to_le_bytes();
+    match replace_slice_rwx(WHALEOIL_PATCH_ADDRESS, &whaleoil_patch) {
+        Ok(_) => {}
+        Err(e) => {
+            error!("Failed to deploy patch: {:?}", e);
+            return 2;
+        }
+    }
+
+    0
+}

mod-town-hall-details/src/ffi.rs

@@ -5,8 +5,8 @@ use std::{
     sync::atomic::{AtomicPtr, Ordering},
 };
 
-use hooklet::windows::x86::{deploy_rel32_raw, hook_call_rel32, CallRel32Hook, FunctionPointerHook, X86Rel32Type};
 use hooklet::windows::x86::hook_function_pointer;
+use hooklet::windows::x86::{deploy_rel32_raw, hook_call_rel32, CallRel32Hook, FunctionPointerHook, X86Rel32Type};
 use log::debug;
 use p3_api::ui::ui_town_hall_window::UITownHallWindowPtr;
 use windows::core::PCSTR;