From 84704156b17a9d508dea4de28a2bba2be3bb2e70 Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Tue, 17 Jun 2025 00:11:11 +0100 Subject: [PATCH] Fix windows x86 compile errors --- src/bins/src/windows/splash.rs | 2 +- src/lib-rust/src/bundle.rs | 2 +- src/wix-dll/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bins/src/windows/splash.rs b/src/bins/src/windows/splash.rs index 2ffaf054..7fcbe48b 100644 --- a/src/bins/src/windows/splash.rs +++ b/src/bins/src/windows/splash.rs @@ -200,7 +200,7 @@ impl SplashWindow { let data_ptr = Box::into_raw(Box::new(Self { frames, rx, frame_idx: 0, w, h, progress: 0, hdc_screen })); - SetWindowLongPtrW(hwnd, GWL_USERDATA, data_ptr as isize); + SetWindowLongPtrW(hwnd, GWL_USERDATA, (data_ptr as isize).try_into()?); let _ = ShowWindow(hwnd, SW_SHOWNOACTIVATE); SetTimer(Some(hwnd), TMR_GIF, delay, None); diff --git a/src/lib-rust/src/bundle.rs b/src/lib-rust/src/bundle.rs index a2e20b5b..2493d634 100644 --- a/src/lib-rust/src/bundle.rs +++ b/src/lib-rust/src/bundle.rs @@ -51,7 +51,7 @@ pub fn load_bundle_from_file<'a, P: AsRef>(file_name: P) -> Result Result { +pub fn load_bundle_from_memory(zip_range: &[u8]) -> Result, Error> { info!("Loading bundle from embedded zip..."); let cursor: Box = Box::new(Cursor::new(zip_range)); let zip = ZipArchive::new(cursor)?; diff --git a/src/wix-dll/src/lib.rs b/src/wix-dll/src/lib.rs index af90aa28..d70f7fd2 100644 --- a/src/wix-dll/src/lib.rs +++ b/src/wix-dll/src/lib.rs @@ -102,6 +102,6 @@ fn show_debug_message(fn_name: &str, message: String) { } #[cfg(not(debug_assertions))] -fn show_debug_message(fn_name: &str, message: String) { +fn show_debug_message(_fn_name: &str, _message: String) { // no-op }