Bump hooklet version, add town hall details mod

Author: Trolldemorted

Cargo.toml

@@ -30,8 +30,7 @@ exclude = [
 version = "0.1.6"
 
 [workspace.dependencies]
-#hooklet = "^0.1.5"
-hooklet = { path = "../hooklet" }
+hooklet = "^0.1.6"
 clap = { version = "4.3.0", features = ["derive"] }
 simple_logger = "4.1"
 log = "0.4"

mod-fix-invulnerable-ship-artillery-slots/src/ffi.rs

@@ -1,6 +1,6 @@
 use std::{arch::global_asm, ffi::c_void};
 
-use hooklet::X86Rel32Type;
+use hooklet::windows::x86::{deploy_rel32_raw, X86Rel32Type};
 use log::{debug, LevelFilter};
 
 const PATCH_ADDRESS_1: u32 = 0x0061FDDB;
@@ -14,11 +14,11 @@ pub unsafe extern "C" fn start() -> u32 {
     let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
     log::set_max_level(LevelFilter::Trace);
 
-    if hooklet::deploy_rel32_raw(PATCH_ADDRESS_1 as _, (&fix_index_calc1) as *const _ as _, X86Rel32Type::Jump).is_err() {
+    if deploy_rel32_raw(PATCH_ADDRESS_1 as _, (&fix_index_calc1) as *const _ as _, X86Rel32Type::Jump).is_err() {
         return 1;
     }
 
-    if hooklet::deploy_rel32_raw(PATCH_ADDRESS_2 as _, (&fix_index_calc2) as *const _ as _, X86Rel32Type::Jump).is_err() {
+    if deploy_rel32_raw(PATCH_ADDRESS_2 as _, (&fix_index_calc2) as *const _ as _, X86Rel32Type::Jump).is_err() {
         return 2;
     }
 

mod-high-res/src/ffi.rs

@@ -5,7 +5,7 @@ use std::{
     sync::atomic::{AtomicPtr, Ordering},
 };
 
-use hooklet::{CallRel32Hook, X86Rel32Type};
+use hooklet::windows::x86::{deploy_rel32_raw, hook_call_rel32, CallRel32Hook, X86Rel32Type};
 use log::debug;
 use p3_api::{
     data::{class27::Class27Ptr, ddraw_fill_solid_rect, ddraw_set_constant_color, ddraw_set_render_dest, get_resolution_height, get_resolution_width},
@@ -47,7 +47,7 @@ pub unsafe extern "C" fn start() -> u32 {
     let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
     log::set_max_level(log::LevelFilter::Trace);
 
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         CALCULATE_RESOLUTION_ON_OPTIONS_MENU_CLOSE_PATCH_ADDRESS as _,
         (&calculate_resolution_after_options_screen) as *const _ as _,
         X86Rel32Type::Jump,
@@ -58,7 +58,7 @@ pub unsafe extern "C" fn start() -> u32 {
     }
 
     // Replace the mapping from class24 resolution field to width and height values
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         CALCULATE_RESOLUTION_BEFORE_SCENE_LOAD_PATCH_ADDRESS as _,
         (&calculate_resolution_before_scene_load) as *const _ as _,
         X86Rel32Type::Jump,
@@ -69,7 +69,7 @@ pub unsafe extern "C" fn start() -> u32 {
     }
 
     // Replace the mapping from ui options resolution field to width and height values
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         CALCULATE_RESOLUTION_AFTER_SCENE_LOAD_PATCH_ADDRESS as _,
         (&calculate_resolution_after_scene_load) as *const _ as _,
         X86Rel32Type::Jump,
@@ -80,7 +80,7 @@ pub unsafe extern "C" fn start() -> u32 {
     }
 
     debug!("Deploying resolution dependent ui positioning patch");
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         REPOSITION_UI_ELEMENTS_PATCH_ADDRESS as _,
         (&reposition_ui_elements) as *const _ as _,
         X86Rel32Type::Jump,
@@ -91,7 +91,7 @@ pub unsafe extern "C" fn start() -> u32 {
     }
 
     debug!("Deploying resolution dependent top bar ui positioning patch");
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         REPOSITION_UI_ELEMENTS_TOP_BAR_PATCH_ADDRESS as _,
         (&reposition_ui_elements_top_bar) as *const _ as _,
         X86Rel32Type::Jump,
@@ -103,7 +103,7 @@ pub unsafe extern "C" fn start() -> u32 {
 
     // Fix empty bottom right corner
     debug!("Deploying render_all_objects_hook");
-    match hooklet::hook_call_rel32(PCSTR::from_raw(ptr::null()), 0x28649, maybe_render_all_objects_hook as usize) {
+    match hook_call_rel32(PCSTR::from_raw(ptr::null()), 0x28649, maybe_render_all_objects_hook as usize as u32) {
         Ok(hook) => {
             HOOK_PTR.store(Box::into_raw(Box::new(hook)), Ordering::SeqCst);
         }
@@ -112,10 +112,10 @@ pub unsafe extern "C" fn start() -> u32 {
 
     // Fix acceleration map
     debug!("Deploying dddraw_dll.dll decode_supported_files hook to replace the background image");
-    match hooklet::hook_call_rel32(
+    match hook_call_rel32(
         PCSTR::from_raw(c"aim.dll".as_ptr() as _),
         0x2984,
-        ddraw_dll_decode_supported_files_hook as usize,
+        ddraw_dll_decode_supported_files_hook as usize as u32,
     ) {
         Ok(hook) => {
             debug!("Hook {hook:?} set");
@@ -126,7 +126,7 @@ pub unsafe extern "C" fn start() -> u32 {
 
     // Fix acceleration map
     debug!("Deploying load screen settings from accelMap.ini");
-    match hooklet::hook_call_rel32(PCSTR::from_raw(ptr::null()), 0x12C5, class73_place_ui_element_hook as usize) {
+    match hook_call_rel32(PCSTR::from_raw(ptr::null()), 0x12C5, class73_place_ui_element_hook as usize as u32) {
         Ok(hook) => {
             debug!("Hook {hook:?} set");
             LOAD_ACCEL_MAP_INI_HOOK_PTR.store(Box::into_raw(Box::new(hook)), Ordering::SeqCst);

mod-shipyard-details/src/ffi.rs

@@ -3,7 +3,7 @@ use std::{
     ffi::{c_void, CStr, CString},
 };
 
-use hooklet::X86Rel32Type;
+use hooklet::windows::x86::{deploy_rel32_raw, X86Rel32Type};
 use log::debug;
 use p3_api::{
     data::{
@@ -42,7 +42,7 @@ pub unsafe extern "C" fn start() -> u32 {
     let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
     log::set_max_level(log::LevelFilter::Trace);
 
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         SHIPYARD_WINDOW_OPEN_PATCH_ADDRESS as _,
         (&ui_shipyard_window_open_detour) as *const _ as _,
         X86Rel32Type::Jump,
@@ -52,7 +52,7 @@ pub unsafe extern "C" fn start() -> u32 {
         return 1;
     }
 
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         LOAD_SHIPYARD_SELECTED_PAGE_PATCH_ADDRESS as _,
         (&load_shipyard_selected_page_detour) as *const _ as _,
         X86Rel32Type::Jump,

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

@@ -1,34 +1,22 @@
 use std::{
     arch::global_asm,
-    ffi::{c_void, CStr, CString},
-    ptr,
+    ffi::c_void,
+    mem, ptr,
     sync::atomic::{AtomicPtr, Ordering},
 };
 
-use hooklet::{FunctionPointerHook, X86Rel32Type};
+use hooklet::windows::x86::{deploy_rel32_raw, hook_call_rel32, CallRel32Hook, FunctionPointerHook, X86Rel32Type};
+use hooklet::windows::x86::hook_function_pointer;
 use log::debug;
-use p3_api::{
-    data::{class48::Class48Ptr, ddraw_set_constant_color, ddraw_set_text_mode, ui_render_text_at},
-    game_world::GAME_WORLD_PTR,
-    missions::alderman_missions::{AldermanMissionDataPtr, FoundTownPtr},
-    scheduled_tasks::{
-        scheduled_task::{ScheduledTaskData, ScheduledTaskPtr},
-        SCHEDULED_TASKS_PTR,
-    },
-    ui::{
-        font::{self, get_normal_font},
-        ui_town_hall_window::UITownHallWindowPtr,
-    },
-};
+use p3_api::ui::ui_town_hall_window::UITownHallWindowPtr;
 use windows::core::PCSTR;
 
-pub static TOWN: &CStr = c"Town";
-pub static TASK_DUE_IN: &CStr = c"Rescheduling in";
-pub static EFFECTIVE_PRODUCTION: &CStr = c"Effective Production";
-
 const TOWN_HALL_WINDOW_OPEN_POINTER_OFFSET: u32 = UITownHallWindowPtr::VTABLE_OFFSET + 0x120;
 pub static TOWN_HALL_WINDOW_OPEN_HOOK_PTR: AtomicPtr<FunctionPointerHook> = AtomicPtr::new(std::ptr::null_mut());
 
+const TOWN_HALL_SIDEPANEL_SET_SELECTED_PAGE_PATCH_OFFSET: u32 = 0x1A94BC;
+pub static TOWN_HALL_SIDEPANEL_SET_SELECTED_PAGE_HOOK_PTR: AtomicPtr<CallRel32Hook> = AtomicPtr::new(std::ptr::null_mut());
+
 const LOAD_TOWN_HALL_SELECTED_PAGE_PATCH_ADDRESS: u32 = 0x005E09AC;
 static LOAD_TOWN_HALL_SELECTED_PAGE_CONTINUATION: u32 = 0x005E09B2;
 
@@ -37,108 +25,69 @@ pub unsafe extern "C" fn start() -> u32 {
     let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
     log::set_max_level(log::LevelFilter::Trace);
 
-    debug!("Hooking town hall's open function through vtable");
-    match hooklet::hook_function_pointer(
+    debug!("Hooking town hall window's open function through vtable");
+    match hook_function_pointer(
         PCSTR::from_raw(ptr::null()),
         TOWN_HALL_WINDOW_OPEN_POINTER_OFFSET,
-        town_hall_open_hook as usize as u32,
+        town_hall_window_open_hook as usize as u32,
     ) {
         Ok(hook) => {
-            debug!("Hook {hook:?} set");
+            debug!("Hook {hook:X?} set");
             TOWN_HALL_WINDOW_OPEN_HOOK_PTR.store(Box::into_raw(Box::new(hook)), Ordering::SeqCst);
         }
         Err(_) => {
             return 1;
         }
     }
 
+    debug!("Hooking sidepanel's call to ui_town_hall_window_set_selected_page");
+    match hook_call_rel32(
+        PCSTR::from_raw(ptr::null()),
+        TOWN_HALL_SIDEPANEL_SET_SELECTED_PAGE_PATCH_OFFSET,
+        town_hall_window_set_selected_page_hook as usize as u32,
+    ) {
+        Ok(hook) => {
+            debug!("Hook {hook:X?} set");
+            TOWN_HALL_SIDEPANEL_SET_SELECTED_PAGE_HOOK_PTR.store(Box::into_raw(Box::new(hook)), Ordering::SeqCst);
+        }
+        Err(_) => {
+            return 2;
+        }
+    }
+
     debug!("Detouring town hall's rendering function at the selected page switch");
-    if hooklet::deploy_rel32_raw(
+    if deploy_rel32_raw(
         LOAD_TOWN_HALL_SELECTED_PAGE_PATCH_ADDRESS as _,
         (&load_town_hall_selected_page_detour) as *const _ as _,
         X86Rel32Type::Jump,
     )
     .is_err()
     {
-        return 2;
+        return 3;
     }
 
     0
 }
 
 #[no_mangle]
-pub unsafe extern "thiscall" fn town_hall_open_hook(ui_town_hall_window_address: u32) {
-    crate::handle_open(ui_town_hall_window_address)
+unsafe extern "thiscall" fn town_hall_window_open_hook(ui_town_hall_window_address: u32) {
+    let orig_address = (*TOWN_HALL_WINDOW_OPEN_HOOK_PTR.load(Ordering::SeqCst)).old_absolute;
+    let orig: extern "thiscall" fn(a1: u32) = mem::transmute(orig_address);
+    orig(ui_town_hall_window_address);
+    crate::handle_open()
 }
 
 #[no_mangle]
-pub unsafe extern "thiscall" fn town_hall_rendering_hook() -> i32 {
-    crate::handle_selected_page_switch()
-}
-
-pub unsafe fn render_aldermans_office_modifications(window: &UITownHallWindowPtr) {
-    let next_mission_index = window.get_next_mission_index();
-    if next_mission_index == 0 {
-        return;
-    }
-
-    let selected_mission_index = window.get_selected_alderman_mission_index();
-    if selected_mission_index == 0xff {
-        return;
-    }
-    let task_index = window.get_task_index(selected_mission_index);
-    let task = SCHEDULED_TASKS_PTR.get_scheduled_task(task_index);
-    let data = match task.get_data() {
-        Some(e) => e,
-        None => return,
-    };
-
-    let mission = match data {
-        ScheduledTaskData::AldermanMission(mission) => mission,
-        _ => return,
-    };
-    match mission.get_data() {
-        AldermanMissionDataPtr::FoundTownPtr(ptr) => render_aldermans_office_modifications_found_town(window, &task, &ptr),
-        AldermanMissionDataPtr::OverlandTradeRoute(_ptr) => {}
-        AldermanMissionDataPtr::NotoriousPirate(_ptr) => {}
-        AldermanMissionDataPtr::PirateHideout(_ptr) => {}
-        AldermanMissionDataPtr::SupplyProblems(_ptr) => {}
-    }
+unsafe extern "thiscall" fn town_hall_window_set_selected_page_hook(ui_town_hall_window_address: u32, page: u32) {
+    let orig_address = (*TOWN_HALL_SIDEPANEL_SET_SELECTED_PAGE_HOOK_PTR.load(Ordering::SeqCst)).old_absolute;
+    let orig: extern "thiscall" fn(ui_town_hall_window_address: u32, page: u32) = mem::transmute(orig_address);
+    orig(ui_town_hall_window_address, page);
+    crate::handle_set_selected_page(page)
 }
 
-unsafe fn render_aldermans_office_modifications_found_town(window: &UITownHallWindowPtr, task: &ScheduledTaskPtr, data: &FoundTownPtr) {
-    let town = data.get_town();
-    let effective = data.get_production_effective();
-    let class48 = Class48Ptr::new();
-    class48.set_ignore_below_gradient(0);
-    class48.set_gradient_y(0);
-
-    ddraw_set_constant_color(0xff000000);
-    ddraw_set_text_mode(2);
-    font::ddraw_set_font(get_normal_font());
-    let x = window.get_x();
-    let mut y = window.get_y() + 60;
-
-    ui_render_text_at(x + 120, y, TASK_DUE_IN.to_bytes());
-    let due_in = task.get_due_timestamp() - GAME_WORLD_PTR.get_game_time_raw();
-    let task_due_in_cstring = CString::new(format!("{due_in}")).unwrap();
-    ui_render_text_at(x + 420, y, task_due_in_cstring.to_bytes());
-    y += 20;
-
-    ui_render_text_at(x + 120, y, TOWN.to_bytes());
-    let town_cstring = CString::new(format!("{town:?}")).unwrap();
-    ui_render_text_at(x + 420, y, town_cstring.to_bytes());
-    y += 20;
-
-    ui_render_text_at(x + 120, y, EFFECTIVE_PRODUCTION.to_bytes());
-    let mut effective_string = String::new();
-    for facility in effective {
-        effective_string.push_str(&format!("{facility:?}, "));
-    }
-    effective_string.pop();
-    effective_string.pop();
-    let effective_cstring = CString::new(effective_string).unwrap();
-    ui_render_text_at(x + 420, y, effective_cstring.to_bytes());
+#[no_mangle]
+unsafe extern "thiscall" fn town_hall_selected_page_switch_hook() -> i32 {
+    crate::handle_selected_page_switch()
 }
 
 extern "C" {
@@ -161,5 +110,5 @@ pop ecx
 jmp [{continuation}]
 ",
 load_town_hall_selected_page_detour = sym load_town_hall_selected_page_detour,
-town_hall_rendering_hook = sym town_hall_rendering_hook,
+town_hall_rendering_hook = sym town_hall_selected_page_switch_hook,
 continuation = sym LOAD_TOWN_HALL_SELECTED_PAGE_CONTINUATION);