WIP: Add Windows version support for 50.13 win64 ITCH

Author: vizv

src/config.rs

@@ -55,7 +55,17 @@ pub struct OffsetsMetadata {
 
 #[allow(dead_code)]
 #[derive(Deserialize)]
-pub struct OffsetsValues {}
+pub struct OffsetsValues {
+  pub enabler: Option<usize>,
+  pub gps: Option<usize>,
+  pub addst: Option<usize>,
+  pub addst_top: Option<usize>,
+  pub addst_flag: Option<usize>,
+  pub erasescreen: Option<usize>,
+  pub resize: Option<usize>,
+  pub update_all: Option<usize>,
+  pub update_tile: Option<usize>,
+}
 
 #[allow(dead_code)]
 #[derive(Deserialize)]

src/global.rs

@@ -13,6 +13,15 @@ pub static ENABLER: usize = unsafe {
   }
 };
 
+#[cfg(target_os = "windows")]
+#[static_init::dynamic]
+pub static ENABLER: usize = {
+  match CONFIG.offset.is_some() {
+    true => utils::address(CONFIG.offset.as_ref().unwrap().enabler.unwrap()),
+    false => 0 as usize,
+  }
+};
+
 #[cfg(target_os = "linux")]
 #[static_init::dynamic]
 pub static GPS: usize = unsafe {
@@ -21,3 +30,12 @@ pub static GPS: usize = unsafe {
     false => 0 as usize,
   }
 };
+
+#[cfg(target_os = "windows")]
+#[static_init::dynamic]
+pub static GPS: usize = {
+  match CONFIG.offset.is_some() {
+    true => utils::address(CONFIG.offset.as_ref().unwrap().gps.unwrap()),
+    false => 0 as usize,
+  }
+};

src/hooks.rs

@@ -72,6 +72,7 @@ fn translate(string: usize) -> (String, usize) {
 }
 
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn addst(gps: usize, string: usize, just: u8, space: i32) {
   let (x, y) = gps_get_screen_coord(gps);
   let (content, width) = translate(string);
@@ -81,6 +82,7 @@ fn addst(gps: usize, string: usize, just: u8, space: i32) {
 }
 
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn addst_top(gps: usize, string: usize, just: u8, space: i32) {
   let (x, y) = gps_get_screen_coord(gps);
   let (content, width) = translate(string);
@@ -90,6 +92,7 @@ fn addst_top(gps: usize, string: usize, just: u8, space: i32) {
 }
 
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn addst_flag(gps: usize, string: usize, just: u8, space: i32, sflag: u32) {
   let (x, y) = gps_get_screen_coord(gps);
   let (content, width) = translate(string);
@@ -99,20 +102,32 @@ fn addst_flag(gps: usize, string: usize, just: u8, space: i32, sflag: u32) {
 }
 
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn erasescreen(gps: usize) {
   unsafe { original!(gps) };
   SCREEN.write().clear();
   SCREEN_TOP.write().clear();
 }
 
+#[cfg(target_os = "linux")]
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
 fn resize(renderer: usize, w: u32, h: u32) {
   unsafe { original!(renderer, w, h) };
   SCREEN.write().resize(w, h);
   SCREEN_TOP.write().resize(w, h);
 }
 
+// Windows function is optimized to inline function, so the signature is different
+#[cfg(target_os = "windows")]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
+fn resize(renderer: usize, w: u32, h: u32, screen_x: u32, screen_y: u32, tile_dim_x: u32, tile_dim_y: u32) {
+  unsafe { original!(renderer, w, h, screen_x, screen_y, tile_dim_x, tile_dim_y) };
+  SCREEN.write().resize(w, h);
+  SCREEN_TOP.write().resize(w, h);
+}
+
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn update_all(renderer: usize) {
   unsafe { original!(renderer) };
   SCREEN_TOP.write().render(renderer);
@@ -123,10 +138,17 @@ struct Dimension {
   y: i32,
 }
 
+// TODO: move to config
+#[cfg(target_os = "linux")]
+const DIMENSION_OFFSET: usize = 0xa00;
+#[cfg(target_os = "windows")]
+const DIMENSION_OFFSET: usize = 0x6cc;
+
 #[cfg_attr(target_os = "linux", hook(by_symbol))]
+#[cfg_attr(target_os = "windows", hook(by_offset))]
 fn update_tile(renderer: usize, x: i32, y: i32) {
   unsafe { original!(renderer, x, y) };
-  let dim = raw::deref::<Dimension>(GPS.to_owned() + 0xa00);
+  let dim = raw::deref::<Dimension>(GPS.to_owned() + DIMENSION_OFFSET);
 
   // hack to render text after the last update_tile in update_all
   // TODO: consider re-write update_all function completely according to g_src

src/screen.rs

@@ -7,6 +7,12 @@ use crate::{font::FONT, raw};
 const CANVAS_FONT_WIDTH: i32 = 8 * 2;
 const CANVAS_FONT_HEIGHT: i32 = 12 * 2;
 
+// TODO: move to config
+#[cfg(target_os = "linux")]
+const SCREEN_INFO_OFFSET: usize = 0x160;
+#[cfg(target_os = "windows")]
+const SCREEN_INFO_OFFSET: usize = 0x168;
+
 // TODO: consider to use bitflags crate
 #[allow(dead_code, non_camel_case_types)]
 #[repr(u32)]
@@ -160,7 +166,7 @@ impl Screen {
     }
 
     let canvas = self.canvas_ptr as *mut sdl::SDL_Surface;
-    let screen = raw::deref::<ScreenInfo>(renderer + 0x160);
+    let screen = raw::deref::<ScreenInfo>(renderer + SCREEN_INFO_OFFSET);
 
     unsafe {
       let sdl_renderer = raw::deref(renderer + 0x108);