refactor: add openwa-lib crate with typed WA function wrappers

Move rebase + wa_call primitives to shared openwa-lib crate. Add
zero-cost handle types (CWndHandle, CDialogHandle) with methods and
a wa::frontend module that encapsulates inline asm for PaletteAnimation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Cargo.lock

@@ -55,6 +55,13 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "openwa-lib"
+version = "0.1.0"
+dependencies = [
+ "openwa-types",
+]
+
 [[package]]
 name = "openwa-types"
 version = "0.1.0"
@@ -73,6 +80,7 @@ name = "openwa-wormkit"
 version = "0.1.0"
 dependencies = [
  "minhook",
+ "openwa-lib",
  "openwa-types",
  "windows-sys",
 ]

crates/openwa-lib/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "openwa-lib"
+version = "0.1.0"
+edition = "2021"
+description = "Shared library for calling WA.exe functions with typed wrappers"
+
+[dependencies]
+openwa-types = { path = "../openwa-types" }

crates/openwa-lib/src/lib.rs

@@ -0,0 +1,5 @@
+#![allow(non_snake_case)]
+
+pub mod rebase;
+pub mod wa;
+pub mod wa_call;

crates/openwa-lib/src/wa/frontend.rs

@@ -0,0 +1,23 @@
+//! WA-internal frontend function wrappers.
+
+use crate::rebase::rb;
+use openwa_types::address::va;
+
+/// Frontend__PaletteAnimation (0x422180)
+///
+/// `__usercall`: EAX = implicit param (from dialog+0x12c),
+/// 2 stack params: &DAT_007be560 (palette data), palette_param (from dialog+0x134).
+pub unsafe fn palette_animation(eax_value: u32, palette_param: u32) {
+    let addr = rb(va::FRONTEND_PALETTE_ANIMATION);
+    let data = rb(0x7be560);
+    core::arch::asm!(
+        "push {param}",
+        "push {palette}",
+        "call {func}",
+        param = in(reg) palette_param,
+        palette = in(reg) data,
+        func = in(reg) addr,
+        in("eax") eax_value,
+        clobber_abi("C"),
+    );
+}

crates/openwa-lib/src/wa/mfc.rs

@@ -0,0 +1,33 @@
+//! MFC library function wrappers.
+
+use crate::wa_call;
+
+/// Zero-cost handle to a CWnd-derived MFC window (raw pointer as u32).
+#[derive(Clone, Copy)]
+#[repr(transparent)]
+pub struct CWndHandle(pub u32);
+
+impl CWndHandle {
+    /// CWnd::EnableWindow (0x5C647A) — thiscall(this, bEnable)
+    pub unsafe fn enable_window(&self, enable: bool) {
+        wa_call::thiscall_1(0x5C647A, self.0, enable as u32);
+    }
+}
+
+/// Zero-cost handle to a CDialog-derived MFC dialog.
+#[derive(Clone, Copy)]
+#[repr(transparent)]
+pub struct CDialogHandle(pub u32);
+
+impl CDialogHandle {
+    /// CDialog::EndDialog (0x5CAB72) — thiscall(this, nResult)
+    pub unsafe fn end_dialog(&self, result: u32) {
+        wa_call::thiscall_1(0x5CAB72, self.0, result);
+    }
+}
+
+impl From<CDialogHandle> for CWndHandle {
+    fn from(d: CDialogHandle) -> Self {
+        CWndHandle(d.0)
+    }
+}

crates/openwa-lib/src/wa/mod.rs

@@ -0,0 +1,4 @@
+//! Typed wrappers for calling WA.exe and library functions.
+
+pub mod frontend;
+pub mod mfc;

crates/openwa-wormkit/Cargo.toml

@@ -9,6 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 openwa-types = { path = "../openwa-types" }
+openwa-lib = { path = "../openwa-lib" }
 minhook = "0.9"
 
 [target.'cfg(target_os = "windows")'.dependencies]

crates/openwa-wormkit/src/hook.rs

@@ -60,7 +60,7 @@ use std::ffi::c_void;
 use minhook::MinHook;
 
 use crate::log_line;
-use crate::rebase::rb;
+use openwa_lib::rebase::rb;
 
 /// Install a MinHook inline hook on a WA.exe function.
 ///

crates/openwa-wormkit/src/lib.rs

@@ -3,8 +3,6 @@
 use std::ffi::c_void;
 
 pub mod hook;
-pub mod rebase;
-pub mod wa_call;
 mod replacements;
 
 // ---------------------------------------------------------------------------
@@ -55,7 +53,7 @@ fn clear_log() -> std::io::Result<()> {
 fn run() -> Result<(), String> {
     let _ = clear_log();
 
-    let delta = rebase::init();
+    let delta = openwa_lib::rebase::init();
     let _ = log_line(&format!(
         "=== OpenWA WormKit DLL loaded ===\n  ASLR delta: 0x{delta:08X}"
     ));

crates/openwa-wormkit/src/replacements/frontend.rs

@@ -6,8 +6,8 @@
 use std::sync::atomic::{AtomicU32, Ordering};
 
 use crate::log_line;
-use crate::rebase::rb;
-use crate::wa_call;
+use openwa_lib::wa::mfc::{CDialogHandle, CWndHandle};
+use openwa_lib::wa_call;
 use openwa_types::address::va;
 use openwa_types::frontend::ScreenId;
 
@@ -36,27 +36,15 @@ unsafe extern "cdecl" fn frontend_change_screen_impl(dialog: u32, screen_id: u32
         }
     } else {
         // Normal path: full screen transition
+        let wnd = CWndHandle(dialog);
+        let dlg = CDialogHandle(dialog);
 
-        // CWnd::EnableWindow(dialog, FALSE)
-        wa_call::thiscall_1(0x5C647A, dialog, 0);
+        wnd.enable_window(false);
 
-        // Frontend__PaletteAnimation(&DAT_007be560, [dialog+0x134])
-        // Note: original also loads [ESI+0x12c] into EAX before the call.
-        // We replicate this with inline asm to set EAX as the implicit param.
+        // Frontend__PaletteAnimation: EAX = [dialog+0x12c], param = [dialog+0x134]
         let palette_param = *((dialog + 0x134) as *const u32);
         let eax_value = *((dialog + 0x12c) as *const u32);
-        let palette_anim_addr = rb(va::FRONTEND_PALETTE_ANIMATION);
-        let palette_data_addr = rb(0x7be560);
-        core::arch::asm!(
-            "push {param}",
-            "push {palette}",
-            "call {func}",
-            param = in(reg) palette_param,
-            palette = in(reg) palette_data_addr,
-            func = in(reg) palette_anim_addr,
-            in("eax") eax_value,
-            clobber_abi("C"),
-        );
+        openwa_lib::wa::frontend::palette_animation(eax_value, palette_param);
 
         // Virtual calls: vtable[0x15C](1) then vtable[0x15C](2)
         for i in 1u32..=2 {
@@ -64,11 +52,8 @@ unsafe extern "cdecl" fn frontend_change_screen_impl(dialog: u32, screen_id: u32
             wa_call::thiscall_indirect_1(vtable + 0x15C, dialog, i);
         }
 
-        // CWnd::EnableWindow(dialog, TRUE)
-        wa_call::thiscall_1(0x5C647A, dialog, 1);
-
-        // CDialog::EndDialog(dialog, screen_id)
-        wa_call::thiscall_1(0x5CAB72, dialog, screen_id);
+        wnd.enable_window(true);
+        dlg.end_dialog(screen_id);
     }
 
     // Log the transition